valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "exp: switch to kaniko"" 

This reverts commit b07ad642de.
This commit is contained in:
Andrew Dolgov 2023-10-19 09:47:01 +03:00
parent b07ad642de
commit 6c75ea17da
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.docker/app/Dockerfile
View File

@ -33,15 +33,17 @@ ENV CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP}
ARG CI_COMMIT_SHA ARG CI_COMMIT_SHA
ENV CI_COMMIT_SHA=${CI_COMMIT_SHA} ENV CI_COMMIT_SHA=${CI_COMMIT_SHA}
ADD --chmod=0755 startup.sh ${SCRIPT_ROOT} ADD .docker/app/startup.sh ${SCRIPT_ROOT}
ADD --chmod=0755 updater.sh ${SCRIPT_ROOT} ADD .docker/app/updater.sh ${SCRIPT_ROOT}
ADD --chmod=0755 dcron.sh ${SCRIPT_ROOT} ADD .docker/app/dcron.sh ${SCRIPT_ROOT}
ADD --chmod=0755 backup.sh /etc/periodic/weekly/backup ADD .docker/app/backup.sh /etc/periodic/weekly/backup
ADD index.php ${SCRIPT_ROOT} RUN chmod 0755 ${SCRIPT_ROOT}/*.sh
ADD config.docker.php ${SCRIPT_ROOT}
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 ARG ORIGIN_REPO_XACCEL=https://git.tt-rss.org/fox/ttrss-nginx-xaccel.git

2
.docker/web-nginx/Dockerfile
View File

@ -2,7 +2,7 @@ FROM registry.fakecake.org/docker.io/nginx:alpine
HEALTHCHECK CMD curl --fail http://localhost/tt-rss/index.php || exit 1 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 # 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 # name can be overridden at runtime by passing an APP_UPSTREAM env var

10
.gitlab-ci.yml
View File

@ -8,7 +8,7 @@ variables:
include: include:
- project: 'ci/ci-templates' - project: 'ci/ci-templates'
ref: master ref: master
file: .ci-build-docker.yml file: .ci-build-docker-kaniko.yml
- project: 'ci/ci-templates' - project: 'ci/ci-templates'
ref: master ref: master
file: .ci-lint-common.yml file: .ci-lint-common.yml
@ -25,22 +25,22 @@ phpstan:
ttrss-web-nginx: ttrss-web-nginx:
extends: .build-master extends: .build-master
variables: variables:
BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
ttrss-web-nginx:branch: ttrss-web-nginx:branch:
extends: .build-branch extends: .build-branch
variables: variables:
BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
ttrss-fpm-pgsql-static: ttrss-fpm-pgsql-static:
extends: .build-master extends: .build-master
variables: variables:
BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
ttrss-fpm-pgsql-static:branch: ttrss-fpm-pgsql-static:branch:
extends: .build-branch extends: .build-branch
variables: variables:
BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
phpdoc: phpdoc:
image: ${PHP_IMAGE} image: ${PHP_IMAGE}