From 56315b39b46c8bf05ed9842b547b7d8ef5bfe526 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 17 Oct 2023 16:35:47 +0300 Subject: [PATCH 1/3] exp: switch to kaniko --- .docker/app/Dockerfile | 16 +++++++++------- .docker/web-nginx/Dockerfile | 2 +- .gitlab-ci.yml | 10 +++++----- 3 files changed, 15 insertions(+), 13 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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b28067f2..f11fa7931 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: include: - project: 'ci/ci-templates' ref: master - file: .ci-build-docker.yml + file: .ci-build-docker-kaniko.yml - project: 'ci/ci-templates' ref: master file: .ci-lint-common.yml @@ -25,22 +25,22 @@ phpstan: ttrss-web-nginx: extends: .build-master variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile ttrss-web-nginx:branch: extends: .build-branch variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile ttrss-fpm-pgsql-static: extends: .build-master variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile ttrss-fpm-pgsql-static:branch: extends: .build-branch variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile phpdoc: image: ${PHP_IMAGE} From b07ad642ded470f3ec5b30b52e85b42637aa8f60 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 19 Oct 2023 09:21:49 +0300 Subject: [PATCH 2/3] Revert "exp: switch to kaniko" This reverts commit 56315b39b46c8bf05ed9842b547b7d8ef5bfe526. --- .docker/app/Dockerfile | 16 +++++++--------- .docker/web-nginx/Dockerfile | 2 +- .gitlab-ci.yml | 10 +++++----- 3 files changed, 13 insertions(+), 15 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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f11fa7931..8b28067f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: include: - project: 'ci/ci-templates' ref: master - file: .ci-build-docker-kaniko.yml + file: .ci-build-docker.yml - project: 'ci/ci-templates' ref: master file: .ci-lint-common.yml @@ -25,22 +25,22 @@ phpstan: ttrss-web-nginx: extends: .build-master variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx ttrss-web-nginx:branch: extends: .build-branch variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx ttrss-fpm-pgsql-static: extends: .build-master variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile + BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app ttrss-fpm-pgsql-static:branch: extends: .build-branch variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile + BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app phpdoc: image: ${PHP_IMAGE} From 6c75ea17da86ea4f6a72ad75d5c64823453ca900 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 19 Oct 2023 09:47:01 +0300 Subject: [PATCH 3/3] Revert "Revert "exp: switch to kaniko"" This reverts commit b07ad642ded470f3ec5b30b52e85b42637aa8f60. --- .docker/app/Dockerfile | 16 +++++++++------- .docker/web-nginx/Dockerfile | 2 +- .gitlab-ci.yml | 10 +++++----- 3 files changed, 15 insertions(+), 13 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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b28067f2..f11fa7931 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: include: - project: 'ci/ci-templates' ref: master - file: .ci-build-docker.yml + file: .ci-build-docker-kaniko.yml - project: 'ci/ci-templates' ref: master file: .ci-lint-common.yml @@ -25,22 +25,22 @@ phpstan: ttrss-web-nginx: extends: .build-master variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile ttrss-web-nginx:branch: extends: .build-branch variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile ttrss-fpm-pgsql-static: extends: .build-master variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile ttrss-fpm-pgsql-static:branch: extends: .build-branch variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile phpdoc: image: ${PHP_IMAGE}