Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'development' into 'master'
v1.2.0 - included news

The new update (v1.2.0) brings the news section to the application. This will be possible by using the "Newsriver" API.

See merge request Javinator9889/handwashing-reminder!9
  • Loading branch information
Javinator9889 committed Jul 3, 2020
2 parents 885f784 + 2fcfff1 commit 2b9a235
Show file tree
Hide file tree
Showing 164 changed files with 10,708 additions and 2,443 deletions.
40 changes: 40 additions & 0 deletions .dockerignore
@@ -0,0 +1,40 @@
ads
android-signing-keystore.jks
api-5245190277294621651-718463-f914fb7573c6.json
app
appintro
build
build.gradle
bundledemoji
CHANGELOG
Dockerfile
.dockerignore
extras
Gemfile
Gemfile.lock
.git
.gitignore
.gitlab-ci.yml
.gitmodules
.gradle
gradle
gradle.properties
gradlew
gradlew.bat
handwashing_app_logo.png
handwashing_app_logo.webp
handwashing_icon.png
handwashing_icon.webp
.idea
keystore.properties
LICENSE
local.properties
public
README.md
secrets.properties
settings.gradle
test-app-js
tgs
.vscode
functions/node_modules
functions/ui-debug.log
5 changes: 5 additions & 0 deletions .firebaserc
@@ -0,0 +1,5 @@
{
"projects": {
"default": "handwashing"
}
}
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -18,3 +18,4 @@ api-5245190277294621651-718463-f914fb7573c6.json
*.jks
google-services.json
services.xml
test-app-js/
128 changes: 0 additions & 128 deletions .gitlab-ci.yml

This file was deleted.

108 changes: 11 additions & 97 deletions Dockerfile
@@ -1,97 +1,11 @@
# ====================================================================== #
# Android SDK Docker Image
# ====================================================================== #

# Base image
# ---------------------------------------------------------------------- #
FROM ubuntu:18.04

# Author
# ---------------------------------------------------------------------- #
LABEL maintainer "thyrlian@gmail.com"

# support multiarch: i386 architecture
# install Java
# install essential tools
# install Qt
RUN dpkg --add-architecture i386 && \
apt update -y && \
apt install -y --no-install-recommends libncurses5:i386 libc6:i386 libstdc++6:i386 lib32gcc1 lib32ncurses5 lib32z1 zlib1g:i386 && \
apt install -y --no-install-recommends openjdk-8-jdk && \
apt install -y --no-install-recommends git wget unzip && \
apt install -y --no-install-recommends qt5-default

# download and install Gradle
# https://services.gradle.org/distributions/
ARG GRADLE_VERSION=6.1.1
ARG GRADLE_DIST=bin
RUN cd /opt && \
wget -q https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-${GRADLE_DIST}.zip && \
unzip gradle*.zip && \
ls -d */ | sed 's/\/*$//g' | xargs -I{} mv {} gradle && \
rm gradle*.zip

# download and install Kotlin compiler
# https://github.com/JetBrains/kotlin/releases/latest
ARG KOTLIN_VERSION=1.3.71
RUN cd /opt && \
wget -q https://github.com/JetBrains/kotlin/releases/download/v${KOTLIN_VERSION}/kotlin-compiler-${KOTLIN_VERSION}.zip && \
unzip *kotlin*.zip && \
rm *kotlin*.zip

# download and install Android SDK
# https://developer.android.com/studio/#downloads
ARG ANDROID_SDK_VERSION=4333796
ENV ANDROID_HOME /opt/android-sdk
RUN mkdir -p ${ANDROID_HOME} && cd ${ANDROID_HOME} && \
wget -q https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_VERSION}.zip && \
unzip *tools*linux*.zip && \
rm *tools*linux*.zip

# set the environment variables
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
ENV GRADLE_HOME /opt/gradle
ENV KOTLIN_HOME /opt/kotlinc
ENV PATH ${PATH}:${GRADLE_HOME}/bin:${KOTLIN_HOME}/bin:${ANDROID_HOME}/emulator:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools/bin
ENV _JAVA_OPTIONS -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
# WORKAROUND: for issue https://issuetracker.google.com/issues/37137213
ENV LD_LIBRARY_PATH ${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib

# accept the license agreements of the SDK components
ADD license_accepter.sh /opt/
RUN chmod +x /opt/license_accepter.sh && /opt/license_accepter.sh $ANDROID_HOME

# setup adb server
EXPOSE 5037

# install and configure SSH server
EXPOSE 22
ADD sshd-banner /etc/ssh/
ADD authorized_keys /tmp/
RUN apt-get update -y && \
apt-get install -y --no-install-recommends openssh-server supervisor locales && \
mkdir -p /var/run/sshd /var/log/supervisord && \
locale-gen en en_US en_US.UTF-8 && \
apt-get remove -y locales && apt-get autoremove -y && \
FILE_SSHD_CONFIG="/etc/ssh/sshd_config" && \
echo "\nBanner /etc/ssh/sshd-banner" >> $FILE_SSHD_CONFIG && \
echo "\nPermitUserEnvironment=yes" >> $FILE_SSHD_CONFIG && \
ssh-keygen -q -N "" -f /root/.ssh/id_rsa && \
FILE_SSH_ENV="/root/.ssh/environment" && \
touch $FILE_SSH_ENV && chmod 600 $FILE_SSH_ENV && \
printenv | grep "JAVA_HOME\|GRADLE_HOME\|KOTLIN_HOME\|ANDROID_HOME\|LD_LIBRARY_PATH\|PATH" >> $FILE_SSH_ENV && \
FILE_AUTH_KEYS="/root/.ssh/authorized_keys" && \
touch $FILE_AUTH_KEYS && chmod 600 $FILE_AUTH_KEYS && \
for file in /tmp/*.pub; \
do if [ -f "$file" ]; then echo "\n" >> $FILE_AUTH_KEYS && cat $file >> $FILE_AUTH_KEYS && echo "\n" >> $FILE_AUTH_KEYS; fi; \
done && \
(rm /tmp/*.pub 2> /dev/null || true)

ADD supervisord.conf /etc/supervisor/conf.d/
CMD ["/usr/bin/supervisord"]

# install Fastlane
COPY Gemfile.lock .
COPY Gemfile .
RUN gem install bundle
RUN bundle install
FROM node:lts-alpine
# app directory
WORKDIR /usr/src/app
# Copy neccessary files
COPY ./functions ./functions
COPY ./firebase.json ./
COPY ./.firebaserc ./
WORKDIR /usr/src/app/functions
RUN npm i --only=production -g pm2@latest firebase-tools cross-env typescript
RUN npm ci --only=production
CMD ["pm2-runtime", "start", "daemon.json"]
31 changes: 0 additions & 31 deletions Dockerfile.old

This file was deleted.

3 changes: 0 additions & 3 deletions Gemfile

This file was deleted.

0 comments on commit 2b9a235

Please sign in to comment.