From 9cb0f3eca0bce146bcd5a74074bfcd688b801843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Tue, 3 Nov 2015 06:31:28 +0000 Subject: [PATCH] Improving packaging time for ubuntu14 #423 --- Makefile | 7 ----- .../proxysql/ubuntu-14.04-build/Dockerfile | 29 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 docker/images/proxysql/ubuntu-14.04-build/Dockerfile diff --git a/Makefile b/Makefile index c5f5682a4..7a73b9bd5 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,6 @@ binaries/proxysql_1.0.1-ubuntu14_amd64.deb: docker rm ubuntu14_build || true docker create --name ubuntu14_build renecannao/proxysql:build-ubuntu14 bash -c "while : ; do sleep 10 ; done" docker start ubuntu14_build - docker exec ubuntu14_build bash -c "apt-get install -y python" docker exec ubuntu14_build bash -c "cd /opt; git clone https://github.com/sysown/proxysql.git proxysql" docker exec ubuntu14_build bash -c "cd /opt/proxysql; make clean && make -j" docker cp docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl ubuntu14_build:/opt/proxysql/ @@ -83,12 +82,6 @@ binaries/proxysql_1.0.1-ubuntu14_amd64.deb: docker cp ubuntu14_build:/opt/proxysql/proxysql_1.0.1_amd64.deb ./binaries/proxysql_1.0.1-ubuntu14_amd64.deb docker stop ubuntu14_build docker rm ubuntu14_build -# docker build -t ubuntu14_proxysql --no-cache=true ./docker/images/proxysql/ubuntu-14.04-build -# docker run -i --name=ubuntu14_build ubuntu14_proxysql bash & -# sleep 5 -# docker cp ubuntu14_build:/opt/proxysql/proxysql_1.0.1_amd64.deb ./binaries/proxysql_1.0.1-ubuntu14_amd64.deb -# docker kill ubuntu14_build -# docker rm ubuntu14_build .PHONY: cleanall diff --git a/docker/images/proxysql/ubuntu-14.04-build/Dockerfile b/docker/images/proxysql/ubuntu-14.04-build/Dockerfile deleted file mode 100644 index 5c0618a5a..000000000 --- a/docker/images/proxysql/ubuntu-14.04-build/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM ubuntu:14.04 -MAINTAINER Andrei Ismail - -LABEL vendor=proxysql\ - com.proxysql.type=proxysql\ - com.proxysql.os=ubuntu14\ - com.proxysql.interactive=false\ - com.proxysql.config=simple\ - com.proxysql.purpose=packaging - -RUN apt-get update && apt-get install -y\ - automake\ - cmake\ - equivs\ - make\ - g++\ - gcc\ - gdb\ - gdbserver\ - git\ - libmysqlclient-dev\ - libssl-dev\ - libtool - -RUN cd /opt; git clone https://github.com/sysown/proxysql.git proxysql -RUN cd /opt/proxysql; make clean && make -j - -ADD ./proxysql.ctl /opt/proxysql/proxysql.ctl -RUN cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl