From 6838a81e50ccaff97c62e44ab96b3ffc99c5e256 Mon Sep 17 00:00:00 2001 From: Attilio Borello Date: Wed, 10 May 2017 08:54:38 +0200 Subject: [PATCH 1/2] replaced docker images with alpine if available (nginx, rabbitmq) --- integration/resources/compose/boulder.yml | 2 +- integration/resources/compose/constraints.yml | 2 +- integration/resources/compose/consul_catalog.yml | 2 +- integration/resources/compose/file.yml | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integration/resources/compose/boulder.yml b/integration/resources/compose/boulder.yml index 8320c6a92..f1f954377 100644 --- a/integration/resources/compose/boulder.yml +++ b/integration/resources/compose/boulder.yml @@ -39,6 +39,6 @@ bmysql: MYSQL_ALLOW_EMPTY_PASSWORD: "yes" log_driver: none brabbitmq: - image: rabbitmq:3 + image: rabbitmq:3-alpine environment: RABBITMQ_NODE_IP_ADDRESS: "0.0.0.0" diff --git a/integration/resources/compose/constraints.yml b/integration/resources/compose/constraints.yml index 9a2688904..1d5395281 100644 --- a/integration/resources/compose/constraints.yml +++ b/integration/resources/compose/constraints.yml @@ -12,6 +12,6 @@ consul: - "8302" - "8302/udp" nginx: - image: nginx + image: nginx:alpine ports: - "8881:80" diff --git a/integration/resources/compose/consul_catalog.yml b/integration/resources/compose/consul_catalog.yml index 9a2688904..1d5395281 100644 --- a/integration/resources/compose/consul_catalog.yml +++ b/integration/resources/compose/consul_catalog.yml @@ -12,6 +12,6 @@ consul: - "8302" - "8302/udp" nginx: - image: nginx + image: nginx:alpine ports: - "8881:80" diff --git a/integration/resources/compose/file.yml b/integration/resources/compose/file.yml index acd082616..1d3dddd1d 100644 --- a/integration/resources/compose/file.yml +++ b/integration/resources/compose/file.yml @@ -1,20 +1,20 @@ nginx1: - image: nginx + image: nginx:alpine ports: - "8881:80" nginx2: - image: nginx + image: nginx:alpine ports: - "8882:80" nginx3: - image: nginx + image: nginx:alpine ports: - "8883:80" nginx4: - image: nginx + image: nginx:alpine ports: - "8884:80" nginx5: - image: nginx + image: nginx:alpine ports: - "8885:80" From 1e591dd188ee5768bdc9f2fa2fe851b9cf90ff8b Mon Sep 17 00:00:00 2001 From: Attilio Borello Date: Wed, 10 May 2017 09:33:41 +0200 Subject: [PATCH 2/2] clean up apt-cache in webui/Dockerfile --- webui/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webui/Dockerfile b/webui/Dockerfile index 5102a3969..c78d2bfd1 100644 --- a/webui/Dockerfile +++ b/webui/Dockerfile @@ -7,7 +7,8 @@ RUN apt-get -yq update \ && apt-get -yq --no-install-suggests --no-install-recommends --force-yes install apt-transport-https \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ -&& apt-get -yq update && apt-get -yq --no-install-suggests --no-install-recommends --force-yes install yarn +&& apt-get -yq update && apt-get -yq --no-install-suggests --no-install-recommends --force-yes install yarn \ +&& rm -fr /var/lib/apt/lists/ COPY package.json $WEBUI_DIR/ COPY yarn.lock $WEBUI_DIR/