diff options
| author | Andrew Dolgov <[email protected]> | 2023-10-17 11:04:40 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2023-10-17 11:33:10 +0300 |
| commit | 3f54d573705af8d09764f3b033750911bb9148cb (patch) | |
| tree | 3f006a2e60b92af8e53b5223a350d8013902f5b0 | |
| parent | 8ce9ca1d928bda4b2721dfda03dbf2831b12626c (diff) | |
exp: switch to kanikoprotected/kaniko
| -rw-r--r-- | .docker/app/Dockerfile | 8 | ||||
| -rw-r--r-- | .docker/dict/Dockerfile | 2 | ||||
| -rw-r--r-- | .docker/web-nginx/Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 30 |
4 files changed, 21 insertions, 21 deletions
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index 36eabad..7e1b96c 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -32,11 +32,11 @@ 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 index.php ${SCRIPT_ROOT} -ADD config.docker.php ${SCRIPT_ROOT} +ADD --chmod=0755 .docker/app/startup.sh ${SCRIPT_ROOT} +ADD .docker/app/index.php ${SCRIPT_ROOT} +ADD .docker/app/config.docker.php ${SCRIPT_ROOT} -COPY --from=app-src . ${SRC_DIR} +COPY . ${SRC_DIR} ENV PHP_WORKER_MAX_CHILDREN=5 ENV PHP_WORKER_MEMORY_LIMIT=256M diff --git a/.docker/dict/Dockerfile b/.docker/dict/Dockerfile index 494bee5..8ca492b 100644 --- a/.docker/dict/Dockerfile +++ b/.docker/dict/Dockerfile @@ -2,7 +2,7 @@ FROM registry.fakecake.org/docker.io/debian:buster-slim RUN apt-get update && apt-get install -y dictd mueller7-dict -COPY dictd.conf /etc/dictd/dictd.conf +COPY .docker/dict/dictd.conf /etc/dictd/dictd.conf EXPOSE 2628 diff --git a/.docker/web-nginx/Dockerfile b/.docker/web-nginx/Dockerfile index d6e14ce..41d8e3f 100644 --- a/.docker/web-nginx/Dockerfile +++ b/.docker/web-nginx/Dockerfile @@ -1,3 +1,3 @@ FROM registry.fakecake.org/docker.io/nginx:alpine -COPY nginx.conf /etc/nginx/nginx.conf +COPY .docker/web-nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3de58a..36300c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: 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 @@ -19,29 +19,29 @@ phpstan: the-epube-dict: extends: .build-master variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/dict + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/dict/Dockerfile the-epube-dict:branch: extends: .build-branch variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/dict + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/dict/Dockerfile the-epube-fpm-static: - extends: .build-master - variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app + extends: .build-master + variables: + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile the-epube-fpm-static:branch: - extends: .build-branch - variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app + extends: .build-branch + variables: + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile the-epube-web-nginx: - extends: .build-master - variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx + extends: .build-master + variables: + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile the-epube-web-nginx:branch: - extends: .build-branch - variables: - BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx + extends: .build-branch + variables: + DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile |