diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1af6816245c9eedde4652aa9b8bdb5627606bcf..81c95cc911e269e520a47ee4109f6348dea547e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,9 +40,10 @@ pica-ci-base: metabuid: stage: metabuild before_script: - - echo $REGISTRY_PASSWORD | docker login $REGISTRY -u $REGISTRY_USERNAME --password-stdin + - echo $REGISTRY_PROD_PASSWORD | docker login $REGISTRY_PROD -u $REGISTRY_PROD_USERNAME --password-stdin script: - docker build -f pica-ci/Dockerfile . -t $REGISTRY/pica-ci:$CI_COMMIT_SHA + - echo $REGISTRY_PASSWORD | docker login $REGISTRY -u $REGISTRY_USERNAME --password-stdin - docker push $REGISTRY/pica-ci:$CI_COMMIT_SHA after_script: - docker logout $REGISTRY diff --git a/pica-ci/Dockerfile b/pica-ci/Dockerfile index 24336e01b041a37fb2b17d1827dbe32888ebb2c1..71a72753d01916ad19f29cf8fdc9a811bb7bd251 100644 --- a/pica-ci/Dockerfile +++ b/pica-ci/Dockerfile @@ -1,5 +1,5 @@ FROM registry.picasoft.net/pica-ci-base:latest -& + WORKDIR /workdir COPY . /workdir/ diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile index 3189923a50d7bc89d463861d7f9fa8e07dac16e4..b75a790f82ef5e24cc26e376d15e924561892499 100644 --- a/pica-dokuwiki/Dockerfile +++ b/pica-dokuwiki/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx +FROM nginx:stable LABEL maintainer="antoine@barbare.me" COPY --chown=www-data nginx.conf /etc/nginx/nginx.conf