diff options
Diffstat (limited to '.docker')
-rw-r--r-- | .docker/app/Dockerfile | 16 | ||||
-rw-r--r-- | .docker/web-nginx/Dockerfile | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index d1320fc27..57b090335 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -33,15 +33,17 @@ ENV CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP} ARG CI_COMMIT_SHA ENV CI_COMMIT_SHA=${CI_COMMIT_SHA} -ADD --chmod=0755 startup.sh ${SCRIPT_ROOT} -ADD --chmod=0755 updater.sh ${SCRIPT_ROOT} -ADD --chmod=0755 dcron.sh ${SCRIPT_ROOT} -ADD --chmod=0755 backup.sh /etc/periodic/weekly/backup +ADD .docker/app/startup.sh ${SCRIPT_ROOT} +ADD .docker/app/updater.sh ${SCRIPT_ROOT} +ADD .docker/app/dcron.sh ${SCRIPT_ROOT} +ADD .docker/app/backup.sh /etc/periodic/weekly/backup -ADD index.php ${SCRIPT_ROOT} -ADD config.docker.php ${SCRIPT_ROOT} +RUN chmod 0755 ${SCRIPT_ROOT}/*.sh -COPY --from=app-src . ${SRC_DIR} +ADD .docker/app/index.php ${SCRIPT_ROOT} +ADD .docker/app/config.docker.php ${SCRIPT_ROOT} + +COPY . ${SRC_DIR} ARG ORIGIN_REPO_XACCEL=https://git.tt-rss.org/fox/ttrss-nginx-xaccel.git diff --git a/.docker/web-nginx/Dockerfile b/.docker/web-nginx/Dockerfile index 7f10ed33a..9246f8106 100644 --- a/.docker/web-nginx/Dockerfile +++ b/.docker/web-nginx/Dockerfile @@ -2,7 +2,7 @@ FROM registry.fakecake.org/docker.io/nginx:alpine HEALTHCHECK CMD curl --fail http://localhost/tt-rss/index.php || exit 1 -COPY nginx.conf /etc/nginx/templates/nginx.conf.template +COPY .docker/web-nginx/nginx.conf /etc/nginx/templates/nginx.conf.template # By default, nginx will send the php requests to "app" server, but this server # name can be overridden at runtime by passing an APP_UPSTREAM env var |