From cab0b711340893b63d677f6722418f069fd985f0 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Thu, 18 Apr 2019 08:55:28 +0200
Subject: [PATCH] cleanup gitlab files

---
 .gitlab-ci.yml                  | 11 -----------
 .gitlab-ci/Jobs/build_image.yml | 15 ---------------
 Dockerfile                      |  2 +-
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 .gitlab-ci.yml
 delete mode 100644 .gitlab-ci/Jobs/build_image.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 1b5496a..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-image: alpine:latest
-
-variables:
-  DOCKER_DRIVER: overlay2
-
-stages:
-  - build
-
-include:
-  - '/.gitlab-ci/Jobs/build_image.yml'
-
diff --git a/.gitlab-ci/Jobs/build_image.yml b/.gitlab-ci/Jobs/build_image.yml
deleted file mode 100644
index 2a7c6a2..0000000
--- a/.gitlab-ci/Jobs/build_image.yml
+++ /dev/null
@@ -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
diff --git a/Dockerfile b/Dockerfile
index 036339a..3f1c0a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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