Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F32322782
D3268.1765301691.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Size
8 KB
Referenced Files
None
Subscribers
None
D3268.1765301691.diff
View Options
diff --git a/services/backup/docker-base/Dockerfile b/services/backup/docker-base/Dockerfile
--- a/services/backup/docker-base/Dockerfile
+++ b/services/backup/docker-base/Dockerfile
@@ -1,18 +1,7 @@
-FROM commapp/services-base:1.0
+FROM commapp/services-base:1.1
ENV SHELL=/bin/bash
-COPY services/backup/docker-base/contents /transferred
-
-RUN apt-get update && apt-get install -y \
- libcurl4-openssl-dev \
- libssl-dev \
- uuid-dev \
- zlib1g-dev \
- && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y uuid-dev && rm -rf /var/lib/apt/lists/*
-RUN cd /
-RUN /transferred/install_aws_sdk.sh
-RUN /transferred/install_folly.sh
-
CMD /bin/bash
diff --git a/services/backup/docker-server/Dockerfile b/services/backup/docker-server/Dockerfile
--- a/services/backup/docker-server/Dockerfile
+++ b/services/backup/docker-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM commapp/backup-base:1.1
+FROM commapp/backup-base:1.2
ARG COMM_TEST_SERVICES
ARG COMM_SERVICES_DEV_MODE
diff --git a/services/base-image/Dockerfile b/services/base-image/Dockerfile
--- a/services/base-image/Dockerfile
+++ b/services/base-image/Dockerfile
@@ -16,8 +16,13 @@
libboost-all-dev \
libfmt-dev \
libgtest-dev \
- && rm -rf /var/lib/apt/lists/*
+ libcurl4-openssl-dev \
+ libssl-dev \
+ zlib1g-dev \
+ && rm -rf /var/lib/apt/lists/*
RUN /transferred/install_grpc.sh
+RUN /transferred/install_aws_sdk.sh
+RUN /transferred/install_folly.sh
CMD /bin/bash
diff --git a/services/backup/docker-base/contents/install_aws_sdk.sh b/services/base-image/contents/install_aws_sdk.sh
rename from services/backup/docker-base/contents/install_aws_sdk.sh
rename to services/base-image/contents/install_aws_sdk.sh
--- a/services/backup/docker-base/contents/install_aws_sdk.sh
+++ b/services/base-image/contents/install_aws_sdk.sh
@@ -3,8 +3,8 @@
set -e
if [[ -d /usr/lib/aws-sdk-cpp ]]; then
- echo "aws-sdk already exists, skipping installation(if the installation seems to be broken, remove this container/image and recreate it)..."
- exit 0;
+ echo "aws-sdk already exists, skipping installation(if the installation seems to be broken, remove this container/image and recreate it)..."
+ exit 0
fi
pushd /usr/lib
diff --git a/services/backup/docker-base/contents/install_folly.sh b/services/base-image/contents/install_folly.sh
rename from services/backup/docker-base/contents/install_folly.sh
rename to services/base-image/contents/install_folly.sh
diff --git a/services/base-image/contents/install_grpc.sh b/services/base-image/contents/install_grpc.sh
--- a/services/base-image/contents/install_grpc.sh
+++ b/services/base-image/contents/install_grpc.sh
@@ -5,8 +5,8 @@
echo "installing grpc..."
if [[ -d /usr/lib/grpc ]]; then
- echo "grpc already exists, skipping installation(if the installation seems to be broken, remove this container/image and recreate it)..."
- exit 0;
+ echo "grpc already exists, skipping installation(if the installation seems to be broken, remove this container/image and recreate it)..."
+ exit 0;
fi
pushd /usr/lib
diff --git a/services/blob/docker-base/Dockerfile b/services/blob/docker-base/Dockerfile
--- a/services/blob/docker-base/Dockerfile
+++ b/services/blob/docker-base/Dockerfile
@@ -1,18 +1,7 @@
-FROM commapp/services-base:1.0
+FROM commapp/services-base:1.1
ENV SHELL=/bin/bash
-COPY services/blob/docker-base/contents /transferred
-
-RUN apt-get update && apt-get install -y \
- libcurl4-openssl-dev \
- libssl-dev \
- uuid-dev \
- zlib1g-dev \
- && rm -rf /var/lib/apt/lists/*
-
-RUN cd /
-RUN /transferred/install_aws_sdk.sh
-RUN /transferred/install_folly.sh
+RUN apt-get update && apt-get install -y uuid-dev && rm -rf /var/lib/apt/lists/*
CMD /bin/bash
diff --git a/services/blob/docker-base/contents/install_aws_sdk.sh b/services/blob/docker-base/contents/install_aws_sdk.sh
deleted file mode 100755
--- a/services/blob/docker-base/contents/install_aws_sdk.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ -d /usr/lib/aws-sdk-cpp ]]; then
- echo "aws-sdk already exists, skipping installation(if the installation seems to be broken, remove this container/image and recreate it)..."
- exit 0;
-fi
-
-pushd /usr/lib
-
-git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp -b 1.9.176
-mkdir aws_sdk_build
-pushd aws_sdk_build
-cmake ../aws-sdk-cpp/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/usr/local/aws_sdk -DBUILD_ONLY="core;s3;dynamodb"
-make
-make install
-
-popd # aws_sdk_build
-popd # /usr/lib
diff --git a/services/blob/docker-base/contents/install_folly.sh b/services/blob/docker-base/contents/install_folly.sh
deleted file mode 100755
--- a/services/blob/docker-base/contents/install_folly.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-pushd /usr/lib
-
-git clone https://github.com/facebook/folly.git --branch v2020.01.13.00 --single-branch
-git clone https://github.com/google/glog.git --branch v0.4.0 --single-branch
-git clone https://github.com/google/double-conversion.git --branch v3.1.5 --single-branch
-
-popd # /usr/lib
diff --git a/services/blob/docker-server/Dockerfile b/services/blob/docker-server/Dockerfile
--- a/services/blob/docker-server/Dockerfile
+++ b/services/blob/docker-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM commapp/blob-base:1.2
+FROM commapp/blob-base:1.3
ARG COMM_SERVICES_DEV_MODE
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -2,13 +2,13 @@
services:
base:
build: base-image
- image: commapp/services-base:1.0
+ image: commapp/services-base:1.1
# tunnelbroker
tunnelbroker-base:
build:
dockerfile: services/tunnelbroker/docker-base/Dockerfile
context: ../
- image: commapp/tunnelbroker-base:2.0
+ image: commapp/tunnelbroker-base:2.1
tunnelbroker-server:
build:
dockerfile: services/tunnelbroker/docker-server/Dockerfile
@@ -28,7 +28,7 @@
build:
dockerfile: services/backup/docker-base/Dockerfile
context: ../
- image: commapp/backup-base:1.1
+ image: commapp/backup-base:1.2
backup-server:
build:
dockerfile: services/backup/docker-server/Dockerfile
@@ -47,7 +47,7 @@
build:
dockerfile: services/blob/docker-base/Dockerfile
context: ../
- image: commapp/blob-base:1.2
+ image: commapp/blob-base:1.3
blob-server:
build:
dockerfile: services/blob/docker-server/Dockerfile
diff --git a/services/tunnelbroker/docker-base/Dockerfile b/services/tunnelbroker/docker-base/Dockerfile
--- a/services/tunnelbroker/docker-base/Dockerfile
+++ b/services/tunnelbroker/docker-base/Dockerfile
@@ -1,18 +1,10 @@
-FROM commapp/services-base:1.0
+FROM commapp/services-base:1.1
ENV SHELL=/bin/bash
COPY services/tunnelbroker/docker-base/contents /transferred
-RUN apt-get update && apt-get install -y \
- libcurl4-openssl-dev \
- libssl-dev \
- zlib1g-dev \
- && rm -rf /var/lib/apt/lists/*
-
# Install SDKs
-RUN /transferred/install_folly.sh
-RUN /transferred/install_aws_sdk.sh
RUN /transferred/install_amqp_cpp.sh
RUN /transferred/install_cryptopp.sh
RUN /transferred/install_libuv.sh
diff --git a/services/tunnelbroker/docker-base/contents/install_aws_sdk.sh b/services/tunnelbroker/docker-base/contents/install_aws_sdk.sh
deleted file mode 100755
--- a/services/tunnelbroker/docker-base/contents/install_aws_sdk.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ -d /usr/lib/aws-sdk-cpp ]]; then
- echo "AWS-SDK sources already exists, you can try remove this container/image and recreate it."
- echo "Installation skipped."
- exit 0
-fi
-
-pushd /usr/lib
-
-git clone --recurse-submodules -b 1.9.176 --single-branch https://github.com/aws/aws-sdk-cpp
-mkdir aws_sdk_build
-pushd aws_sdk_build
-cmake ../aws-sdk-cpp/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/usr/local/aws_sdk -DBUILD_ONLY="core;dynamodb"
-make
-make install
-
-popd # aws_sdk_build
-popd # /usr/lib
diff --git a/services/tunnelbroker/docker-base/contents/install_folly.sh b/services/tunnelbroker/docker-base/contents/install_folly.sh
deleted file mode 100755
--- a/services/tunnelbroker/docker-base/contents/install_folly.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-pushd /usr/lib
-
-git clone https://github.com/facebook/folly.git --branch v2020.01.13.00 --single-branch
-git clone https://github.com/google/glog.git --branch v0.4.0 --single-branch
-git clone https://github.com/google/double-conversion.git --branch v3.1.5 --single-branch
-
-popd # /usr/lib
diff --git a/services/tunnelbroker/docker-server/Dockerfile b/services/tunnelbroker/docker-server/Dockerfile
--- a/services/tunnelbroker/docker-server/Dockerfile
+++ b/services/tunnelbroker/docker-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM commapp/tunnelbroker-base:2.0
+FROM commapp/tunnelbroker-base:2.1
ARG COMM_TEST_SERVICES
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Dec 9, 5:34 PM (11 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5856217
Default Alt Text
D3268.1765301691.diff (8 KB)
Attached To
Mode
D3268: [services] Move as much content as possible to the parent base image
Attached
Detach File
Event Timeline
Log In to Comment