diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33ff5fa..c9e2387 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,8 +70,8 @@ ncc-docker-debian: before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}-debian" . - - docker push "$CI_REGISTRY_IMAGE${tag}-debian" + - docker build --pull -t "$CI_REGISTRY_IMAGE$debian" . + - docker push "$CI_REGISTRY_IMAGE$debian" rules: - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_BRANCH == 'dev' exists: diff --git a/Dockerfile b/Dockerfile index 980f2a6..b0295ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,10 +56,8 @@ COPY --from=builder /tmp/. . RUN install-php-extensions mbstring \ ctype \ common; \ - # Add git and tar apk add git tar; \ - # Install phive, phab and ncc; create workdir chmod +x phive.phar; \ mv phive.phar /usr/local/bin/phive; \ diff --git a/Dockerfile.debian b/Dockerfile.debian index 931c938..be0b4b2 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -56,10 +56,8 @@ COPY --from=builder /tmp/. . RUN install-php-extensions mbstring \ ctype \ common; \ - # Add git apt install -y git; \ - # Install phive, phab and ncc; create workdir chmod +x phive.phar; \ mv phive.phar /usr/local/bin/phive; \