Add composer

.gitlab-ci/Dockerfile

@@ -12,8 +12,7 @@ RUN apt-get update && apt-get install -y \
     git \
     make \
     curl \
-    lsb-release \
-    && rm -rf /var/lib/apt/lists/*
+    lsb-release
 
 # PHP Repo
 RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
@@ -29,11 +28,10 @@ RUN apt-get update && apt-get install -y \
     php7.2-zip \
     php7.2-gmp \
     php7.2-sqlite3 \
-    php7.2-mbstring \
-    && rm -rf /var/lib/apt/lists/*
+    php7.2-mbstring
 
 # PHP 7.3
-RUN apt-get update && apt-get install -y \
+RUN apt-get install -y \
     php7.3 \
     php7.3-curl \
     php7.3-soap \
@@ -42,11 +40,10 @@ RUN apt-get update && apt-get install -y \
     php7.3-zip \
     php7.3-gmp \
     php7.3-sqlite3 \
-    php7.3-mbstring \
-    && rm -rf /var/lib/apt/lists/*
+    php7.3-mbstring
 
 # PHP 7.4
-RUN apt-get update && apt-get install -y \
+RUN apt-get install -y \
     php7.4 \
     php7.4-curl \
     php7.4-soap \
@@ -63,6 +60,14 @@ RUN sudo update-alternatives --set php /usr/bin/php7.3
 RUN sudo update-alternatives --set phar /usr/bin/phar7.3
 RUN sudo update-alternatives --set phar.phar /usr/bin/phar.phar7.3
 
+# Install composer
+RUN cd /tmp && \
+    php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
+    php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
+    php composer-setup.php && \
+    php -r "unlink('composer-setup.php');" && \
+    sudo mv composer.phar /usr/local/bin/composer
+
 # Add a normal user and enable sudo
 RUN useradd -u 1000 -ms /bin/bash user
 RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

.gitlab-ci/README.md

@@ -6,7 +6,7 @@ In case of an incompatible change increase the tag version number in build.sh!
 ./build.sh
 
 # first time only
-sudo docker login registry.gitlab.tugraz.at
+docker login registry.gitlab.tugraz.at
 
-sudo docker push registry.gitlab.tugraz.at/dbp/nextcloud/webapppassword/main:v1
+docker push registry.gitlab.tugraz.at/dbp/nextcloud/webapppassword/main:v1
 ```

.gitlab-ci/build.sh

@@ -2,8 +2,8 @@
 
 set -e
 TAG="registry.gitlab.tugraz.at/dbp/nextcloud/webapppassword/main:v1"
-sudo docker build --tag "${TAG}" --file "Dockerfile" .
-sudo docker run --rm --security-opt label=disable \
+docker build --tag "${TAG}" --file "Dockerfile" .
+docker run --rm --security-opt label=disable \
     --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
     --tty --interactive "${TAG}" bash
-echo "Now run: sudo docker push '$TAG'"
+echo "Now run: docker push '$TAG'"