Skip to content

Commit

Permalink
Cleaned up supervisord code
Browse files Browse the repository at this point in the history
EPO-8413
  • Loading branch information
ericdrosas87 authored and blnkt committed Aug 29, 2023
1 parent 86ef297 commit 340e373
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 195 deletions.
17 changes: 2 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG BASE_TAG=latest
LABEL maintainer="[email protected]"
# Composer dependencies
FROM composer:2 as vendor
COPY api/composer.json composer.json
Expand All @@ -8,29 +9,15 @@ RUN composer install --ignore-platform-reqs --no-interaction --prefer-dist

FROM us-central1-docker.pkg.dev/skyviewer/public-images/craft-base-image:$BASE_TAG

LABEL maintainer="[email protected]"

USER root

# Beginning of supervisord code (requires root user)
RUN apt-get update && apt-get -qq install vim python3.10 pip
RUN pip install supervisor
#COPY queue-runner.conf .
#RUN supervisord -c supervisord.conf
#RUN echo " " > supervisord.conf && cat queue-runner.conf > supervisord.conf
# End of supervisord code

# Copy in custom code from the host machine.
WORKDIR /var/www/html
COPY --chown=www-data:www-data api/ ./



COPY --from=vendor --chown=www-data:www-data /app/vendor ./vendor
RUN mkdir /var/secrets && [ -d ./storage ] || mkdir storage

#RUN supervisord

USER www-data

#CMD ["supervisord"]
CMD ["supervisord"]
4 changes: 3 additions & 1 deletion api/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@

# Miscellenious
/log
/tmp
/tmp

supervisor.log
179 changes: 0 additions & 179 deletions api/supervisord.conf

This file was deleted.

0 comments on commit 340e373

Please sign in to comment.