diff options
author | Andrew Dolgov <[email protected]> | 2023-10-19 09:21:49 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2023-10-19 09:21:49 +0300 |
commit | b07ad642ded470f3ec5b30b52e85b42637aa8f60 (patch) | |
tree | 2b13d05516b1e221ec171d8c0a2824cda3eb0f4b /.docker | |
parent | 56315b39b46c8bf05ed9842b547b7d8ef5bfe526 (diff) |
Revert "exp: switch to kaniko"
This reverts commit 56315b39b46c8bf05ed9842b547b7d8ef5bfe526.
Diffstat (limited to '.docker')
-rw-r--r-- | .docker/app/Dockerfile | 16 | ||||
-rw-r--r-- | .docker/web-nginx/Dockerfile | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index 57b090335..d1320fc27 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -33,17 +33,15 @@ ENV CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP} ARG CI_COMMIT_SHA ENV CI_COMMIT_SHA=${CI_COMMIT_SHA} -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 --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 -RUN chmod 0755 ${SCRIPT_ROOT}/*.sh +ADD index.php ${SCRIPT_ROOT} +ADD config.docker.php ${SCRIPT_ROOT} -ADD .docker/app/index.php ${SCRIPT_ROOT} -ADD .docker/app/config.docker.php ${SCRIPT_ROOT} - -COPY . ${SRC_DIR} +COPY --from=app-src . ${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 9246f8106..7f10ed33a 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 .docker/web-nginx/nginx.conf /etc/nginx/templates/nginx.conf.template +COPY 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 |