From d98324cabce983ead9c405ae21b733011d843786 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Thu, 26 Jul 2018 11:39:08 +0200 Subject: [PATCH] install pip3 & bcrypt --- .gitlab-ci.yml | 4 +++- server/debian/stretch/x86_64/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28ba022..cad3f6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ Linux server build: - export -p WORKDIR=$PWD - apt-get update - apt-get dist-upgrade -y - - apt-get install -y bash-completion bsd-mailx cron curl debootstrap fakechroot fakeroot git jq less logrotate lzma nano net-tools openssh-server p7zip p7zip-full schroot sudo unzip vim wget xdelta + - apt-get install -y bash-completion bsd-mailx cron curl debootstrap fakechroot fakeroot git jq less logrotate lzma nano net-tools openssh-server p7zip p7zip-full schroot sudo unzip vim wget xdelta python3-pip python3-bcrypt # - apt-get install -y libcurl4-openssl libfreetype6 libx11 libgl1-mesa libxxf86vm libxrandr libxrender libopenal libxml2 libpng libjpeg62-turbo libxmu libgif libssl liblzma zlib1g libssh2-1 libboost-all libopenal libgl1-mesa libtool libxml2 - apt-get install -y libxml2 libpng16-16 libjpeg62-turbo libxmu6 libgif7 libssl1.1 liblzma5 zlib1g libssh2-1 libtool libxml2 - DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server @@ -85,6 +85,8 @@ Linux server build: - ldconfig - /opt/ext/servercontainer_configure_auto.sh - /opt/ext/servercontainer_update_auto.sh + # Install pymanager + - pip3 install /opt/artefacts/dist/pymanager-1.0.0.tar.gz # Clean - rm -f /opt/servercontainer* # Create image diff --git a/server/debian/stretch/x86_64/Dockerfile b/server/debian/stretch/x86_64/Dockerfile index 3de778e..a155b97 100644 --- a/server/debian/stretch/x86_64/Dockerfile +++ b/server/debian/stretch/x86_64/Dockerfile @@ -23,7 +23,7 @@ ENV HOSTNAME basic_server RUN apt-get update ; \ apt-get dist-upgrade -y ; \ - DEBIAN_FRONTEND=noninteractive apt-get install -y curl nano vim less bash-completion cron logrotate bsd-mailx openssh-server sudo net-tools lzma xdelta p7zip p7zip-full mysql-server apache2 php libapache2-mod-php php-mysql apache2-utils php-gd php-imagick rrdtool screen mcrypt php-mcrypt python3 phpmyadmin gdb valgrind electric-fence + DEBIAN_FRONTEND=noninteractive apt-get install -y curl nano vim less bash-completion cron logrotate bsd-mailx openssh-server sudo net-tools lzma xdelta p7zip p7zip-full mysql-server apache2 php libapache2-mod-php php-mysql apache2-utils php-gd php-imagick rrdtool screen mcrypt php-mcrypt python3 phpmyadmin gdb valgrind electric-fence python3-pip python3-bcrypt