Merge pull request #3218 from huginn/improve_docker

Improve the Docker setup
huginn · Feb 18, 2023 · 5e5ec9e · 5e5ec9e
2 parents 02cc528 + 1ba7322
commit 5e5ec9e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 75 deletions.
diff --git a/docker/multi-process/Dockerfile b/docker/multi-process/Dockerfile
@@ -8,26 +8,33 @@ RUN /scripts/standalone-packages
 
 WORKDIR /app
 
+ENV HOME=/app
+
+ARG UID=1001
+RUN useradd -u "$UID" -g 0 -d /app -s /sbin/nologin -c "default user" default
+
+ENV LC_ALL=en_US.UTF-8
+ENV RAILS_ENV=production
+
 COPY ["Gemfile", "Gemfile.lock", "/app/"]
 COPY lib/gemfile_helper.rb /app/lib/
 COPY vendor/gems/ /app/vendor/gems/
 
 # Get rid of annoying "fatal: Not a git repository (or any of the parent directories): .git" messages
 RUN umask 002 && git init && \
-    export LC_ALL=en_US.UTF-8 RAILS_ENV=production APP_SECRET_TOKEN=secret DATABASE_ADAPTER=mysql2 ON_HEROKU=true && \
     bundle config set --local path vendor/bundle && \
     bundle config set --local without 'test development' && \
-    bundle install -j 4
+    APP_SECRET_TOKEN=secret DATABASE_ADAPTER=mysql2 ON_HEROKU=true bundle install -j 4
 
 COPY ./ /app/
 
 ARG OUTDATED_DOCKER_IMAGE_NAMESPACE=false
-ENV OUTDATED_DOCKER_IMAGE_NAMESPACE ${OUTDATED_DOCKER_IMAGE_NAMESPACE}
+ENV OUTDATED_DOCKER_IMAGE_NAMESPACE=${OUTDATED_DOCKER_IMAGE_NAMESPACE}
 
 RUN umask 002 && \
-    LC_ALL=en_US.UTF-8 RAILS_ENV=production APP_SECRET_TOKEN=secret DATABASE_ADAPTER=mysql2 ON_HEROKU=true bundle exec rake assets:clean assets:precompile && \
-    chmod g=u /app/.env.example /app/Gemfile.lock /app/config/ /app/tmp/
-
+    APP_SECRET_TOKEN=secret DATABASE_ADAPTER=mysql2 ON_HEROKU=true bundle exec rake assets:clean assets:precompile && \
+    chmod g=u /app/.env.example /app/Gemfile.lock /app/config/ /app/tmp/ && \
+    chown -R "$UID" /app
 
 EXPOSE 3000
 
@@ -41,10 +48,6 @@ COPY ["docker/multi-process/scripts/bootstrap.sh", \
       "docker/scripts/setup_env", "/scripts/"]
 CMD ["/scripts/init"]
 
-ARG UID=1001
-RUN useradd -u "$UID" -g 0 -d /app -s /sbin/nologin -c "default user" default
-
 USER $UID
-ENV HOME /app
 
 VOLUME /var/lib/mysql
diff --git a/docker/multi-process/Dockerfile.rbenv b/docker/multi-process/Dockerfile.rbenv
diff --git a/docker/single-process/Dockerfile b/docker/single-process/Dockerfile
@@ -5,33 +5,37 @@ RUN /scripts/prepare
 
 WORKDIR /app
 
+ENV HOME=/app
+
+ARG UID=1001
+RUN useradd -u "$UID" -g 0 -d /app -s /sbin/nologin -c "default user" default
+
+ENV LC_ALL=en_US.UTF-8
+ENV RAILS_ENV=production
+
 COPY ["Gemfile", "Gemfile.lock", "/app/"]
 COPY lib/gemfile_helper.rb /app/lib/
 COPY vendor/gems/ /app/vendor/gems/
 
 # Get rid of annoying "fatal: Not a git repository (or any of the parent directories): .git" messages
 RUN umask 002 && git init && \
-    export LC_ALL=en_US.UTF-8 RAILS_ENV=production APP_SECRET_TOKEN=secret DATABASE_ADAPTER=mysql2 ON_HEROKU=true && \
     bundle config set --local path vendor/bundle && \
     bundle config set --local without 'test development' && \
-    bundle install -j 4
+    APP_SECRET_TOKEN=secret DATABASE_ADAPTER=mysql2 ON_HEROKU=true bundle install -j 4
 
 COPY ./ /app/
 
 ARG OUTDATED_DOCKER_IMAGE_NAMESPACE=false
-ENV OUTDATED_DOCKER_IMAGE_NAMESPACE ${OUTDATED_DOCKER_IMAGE_NAMESPACE}
+ENV OUTDATED_DOCKER_IMAGE_NAMESPACE=${OUTDATED_DOCKER_IMAGE_NAMESPACE}
 
 RUN umask 002 && \
-    LC_ALL=en_US.UTF-8 RAILS_ENV=production APP_SECRET_TOKEN=secret DATABASE_ADAPTER=mysql2 ON_HEROKU=true bundle exec rake assets:clean assets:precompile && \
-    chmod g=u /app/.env.example /app/Gemfile.lock /app/config/ /app/tmp/
+    APP_SECRET_TOKEN=secret DATABASE_ADAPTER=mysql2 ON_HEROKU=true bundle exec rake assets:clean assets:precompile && \
+    chmod g=u /app/.env.example /app/Gemfile.lock /app/config/ /app/tmp/ && \
+    chown -R "$UID" /app
 
 EXPOSE 3000
 
 COPY ["docker/scripts/setup_env", "docker/single-process/scripts/init", "/scripts/"]
 CMD ["/scripts/init"]
 
-ARG UID=1001
-RUN useradd -u "$UID" -g 0 -d /app -s /sbin/nologin -c "default user" default
-
 USER $UID
-ENV HOME /app