gabriel пре 6 година
родитељ
комит
a23d3f2934
1 измењених фајлова са 17 додато и 40 уклоњено
  1. 17 40
      tools/Dockerfile

+ 17 - 40
tools/Dockerfile

@@ -1,48 +1,25 @@
-FROM debian:9
-EXPOSE 8000
-
-## install app
-RUN apt-get update && apt-get install -yq wget apt-transport-https lsb-release ca-certificates software-properties-common gnupg2 curl iputils-ping
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
-RUN apt-get update && apt-get install -yq python python-pip git vim tmux zip build-essential php7.1 iptables xz-utils php7.1-mbstring php7.1-gmp
-# mysql-client php7.1 php7.1-mysql php7.1-curl php7.1-xml php7.1-zip php7.1-bcmath php7.1-mbstring php7.1-dom php7.1-amqp php7.1-soap php7.1-snmp
-
-## install composer
-ADD composer.sh /opt/composer.sh
-RUN chmod +x /opt/composer.sh ; sh /opt/composer.sh
-
-## install docker-composer
-#RUN curl -L https://github.com/docker/compose/releases/download/1.17.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-#RUN chmod +x /usr/local/bin/docker-compose
-RUN pip install --upgrade pip
-RUN pip install docker-compose==1.22
-
-## install ansible
-RUN echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" | tee /etc/apt/sources.list.d/ansible.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
-RUN apt-get update && apt-get install -yq ansible
-
-## install docker
-RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") $(lsb_release -cs) stable"
-RUN apt-get update && apt-get install -yq --allow-unauthenticated docker-ce
-
-## add keys ssh from hosts
-RUN mkdir ~/.ssh
-RUN ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222  infra.flowdat.com >> ~/.ssh/known_hosts
-
-## add key to container
-COPY keys /opt/keys
-RUN chmod 0400 /opt/keys/*
+FROM docker.infra.flowdat.com/fd3/sf-php:7.1
 
 ARG DIR_INSTALL
-RUN mkdir -p $DIR_INSTALL
-RUN chmod -R 777 $DIR_INSTALL
+
 ADD . $DIR_INSTALL
+
 WORKDIR $DIR_INSTALL
 
-RUN cd $DIR_INSTALL ; eval $(ssh-agent); ssh-add /opt/keys/bitbucket.id_rsa; composer install  -n
+RUN echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" | tee /etc/apt/sources.list.d/ansible.list; \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367; \
+    apt-get update; \
+    apt-get install -yq apt-transport-https lsb-release ca-certificates software-properties-common gnupg2 iptables \
+                        xz-utils ansible; \
+    curl https://bootstrap.pypa.io/get-pip.py | python; \
+    pip install -U pip setuptools; \
+    curl -fsSL get.docker.com | sh; \
+    pip install docker-compose==1.22; \
+    mkdir -p $DIR_INSTALL; \
+    chmod -R 777 $DIR_INSTALL; \
+    eval $(ssh-agent); \
+    ssh-add /opt/keys/bitbucket.id_rsa; \
+    composer install  -n
 
 ENV DOCKER_HOST unix:///tmp/docker.sock