cleanup gitlab files

This commit is contained in:
Diego Lendoiro 2019-04-18 08:55:28 +02:00
parent 98323cf3fd
commit cab0b71134
3 changed files with 1 additions and 27 deletions

View File

@ -1,11 +0,0 @@
image: alpine:latest
variables:
DOCKER_DRIVER: overlay2
stages:
- build
include:
- '/.gitlab-ci/Jobs/build_image.yml'

View File

@ -1,15 +0,0 @@
passbolt-prerelease:
stage: build
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- |
/kaniko/executor --context $CI_PROJECT_DIR \
--build-arg PASSBOLT_URL="$PASSBOLT_URL" \
--build-arg PHP_EXTENSIONS="$PHP_EXTENSIONS" \
--build-arg PASSBOLT_BASE_PACKAGES="$PASSBOLT_BASE_PACKAGES" \
--build-arg PASSBOLT_DEV_PACKAGES="$PASSBOLT_DEV_PACKAGES" \
--dockerfile $CI_PROJECT_DIR/Dockerfile \
--destination $CI_REGISTRY_IMAGE:$PASSBOLT_FLAVOUR-$UPSTREAM_COMMIT_SHA

View File

@ -62,6 +62,7 @@ RUN apt-get update \
fi \
&& php composer-setup.php \
&& mv composer.phar /usr/local/bin/composer \
&& rm composer-setup.php \
&& curl -sSL $PASSBOLT_URL | tar zxf - -C . --strip-components 1 \
&& composer install -n --no-dev --optimize-autoloader \
&& chown -R www-data:www-data . \
@ -77,7 +78,6 @@ RUN apt-get update \
&& sed -i 's/# server_tokens/server_tokens/' /etc/nginx/nginx.conf \
&& mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
COPY conf/supervisor/*.conf /etc/supervisor/conf.d/
COPY bin/docker-entrypoint.sh /docker-entrypoint.sh