Skip to content

fix: dockerfile builder #1909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackScanlon merged 1 commit into from
Nov 12, 2025
Merged

fix: dockerfile builder #1909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions docker/app/app.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@ RUN apt-get update -y -q && \
RUN mkdir -p /var/www/concept_lib_sites/v1 && \
mkdir -p /home/config_cll/cll_srvr_logs

# Set perms
RUN chown -R www-data:www-data /var/www /home/config_cll && \
chmod -R 750 /home/config_cll

# Cleanup
RUN apt-get autoremove -y -q && \
apt-get clean -y -q


####################################
## ##
## Build ##
## ##
####################################
FROM base AS builder
# Copy script volume(s)
COPY ./docker/app/scripts/build /bin/scripts
COPY ./docker/app/scripts/init /home/config_cll/init
Expand All @@ -43,27 +58,19 @@ COPY ./docker/requirements /var/www/concept_lib_sites/v1/requirements
# Copy app volume(s)
COPY ./CodeListLibrary_project /var/www/concept_lib_sites/v1/CodeListLibrary_project

# Set perms
RUN chown -R www-data:www-data /var/www /home/config_cll && \
chmod -R 750 /home/config_cll

RUN find /bin/scripts -type f -iname "*.sh" -exec chmod a+x {} \; && \
find /home/config_cll -type f -iname "*.sh" -exec chmod a+x {} \;

# Config & install dependencies
RUN /bin/scripts/dependencies.sh /var/www/concept_lib_sites/v1/requirements/${dependency_target:-production.txt}

# Cleanup
RUN apt-get autoremove -y -q && \
apt-get clean -y -q


####################################
## ##
## Dev ##
## ##
####################################
FROM base AS dev
FROM builder AS dev
WORKDIR /var/www/concept_lib_sites/v1/CodeListLibrary_project


Expand All @@ -72,7 +79,7 @@ WORKDIR /var/www/concept_lib_sites/v1/CodeListLibrary_project
## Prod ##
## ##
####################################
FROM base AS prod
FROM builder AS prod

# Config supervisord
ADD ./docker/app/config/cll.supervisord.conf /etc/supervisord.conf
Expand Down
Loading