Docker Images Update

.github/docker-images/Dockerfile

@@ -5,6 +5,7 @@ FROM ${BASE_IMAGE} AS deploy
 ###############################################################################
 # Copy and build local proxy
 ###############################################################################
+
 COPY . /root/aws-iot-securetunneling-localproxy
 RUN mkdir -p /root/aws-iot-securetunneling-localproxy/build \
     && cd /root/aws-iot-securetunneling-localproxy/build \
@@ -23,4 +24,4 @@ RUN HOME_DIR=/root \
     && bash ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh ${HOME_DIR} \
     && rm -rf ${HOME_DIR}/oss-compliance*
 
-ENTRYPOINT ["/root/bin"]
+ENTRYPOINT ["/root/bin/localproxy"]

.github/docker-images/base-images/amazonlinux/Dockerfile

@@ -1,17 +1,23 @@
-FROM amazonlinux:latest as base
-ARG OPENSSL_CONFIG
+FROM amazonlinux:2023 as base
 
 # Install Prerequisites
 
 RUN yum check-update; yum upgrade -y && \
-	yum install -y git boost-devel autoconf automake \
-	wget libtool curl make gcc-c++ unzip cmake3 python-devel openssl11-devel which
+	yum install -y git boost-devel autoconf automake libatomic perl \
+	wget libtool make gcc-c++ unzip cmake3 python-devel openssl-devel which
 
 # Install Dependencies
 
-RUN ln -s /usr/bin/cmake3 /usr/bin/cmake
 RUN mkdir /home/dependencies
 
+WORKDIR /home/dependencies
+RUN wget https://www.openssl.org/source/openssl-3.0.12.tar.gz \
+    && tar xzvf openssl-3.0.12.tar.gz \
+    && cd openssl-3.0.12 \
+    && ./config \
+    && make \
+    && make install
+
 WORKDIR /home/dependencies
 RUN wget https://github.com/madler/zlib/archive/v1.2.13.tar.gz -O /tmp/zlib-1.2.13.tar.gz && \
 	tar xzvf /tmp/zlib-1.2.13.tar.gz && \
@@ -21,9 +27,9 @@ RUN wget https://github.com/madler/zlib/archive/v1.2.13.tar.gz -O /tmp/zlib-1.2.
 	make install
 
 WORKDIR /home/dependencies
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz -O /tmp/boost.tar.gz && \
+RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.gz -O /tmp/boost.tar.gz && \
 	tar xzvf /tmp/boost.tar.gz && \
-	cd boost_1_81_0 && \
+	cd boost_1_84_0 && \
 	./bootstrap.sh && \
 	./b2 install link=static
 
@@ -37,14 +43,6 @@ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/p
 	make && \
 	make install
 
-WORKDIR /home/dependencies
-RUN git clone https://github.com/openssl/openssl.git && \
-	cd openssl && \
-	git checkout OpenSSL_1_1_1-stable && \
-	./config && \
-	make depend && \
-	make all
-
 WORKDIR /home/dependencies
 RUN git clone --branch v2.13.6 https://github.com/catchorg/Catch2.git && \
 	cd Catch2 && \

.github/docker-images/base-images/debian-ubuntu/Dockerfile

@@ -6,11 +6,18 @@ FROM ${OS} AS base
 RUN apt update && apt upgrade -y && \
 	apt install -y git libboost-all-dev autoconf automake \
 	wget libtool curl make g++ unzip cmake libssl-dev python3
-
 # Install Dependencies
 
 RUN mkdir /home/dependencies
 
+WORKDIR /home/dependencies
+RUN wget https://www.openssl.org/source/openssl-3.0.12.tar.gz \
+    && tar xzvf openssl-3.0.12.tar.gz \
+    && cd openssl-3.0.12 \
+    && ./config \
+    && make \
+    && make install
+
 WORKDIR /home/dependencies
 RUN wget https://github.com/madler/zlib/archive/v1.2.13.tar.gz -O /tmp/zlib-1.2.13.tar.gz && \
 	tar xzvf /tmp/zlib-1.2.13.tar.gz && \
@@ -20,9 +27,9 @@ RUN wget https://github.com/madler/zlib/archive/v1.2.13.tar.gz -O /tmp/zlib-1.2.
 	make install
 
 WORKDIR /home/dependencies
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz -O /tmp/boost.tar.gz && \
+RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.gz -O /tmp/boost.tar.gz && \
 	tar xzvf /tmp/boost.tar.gz && \
-	cd boost_1_81_0 && \
+	cd boost_1_84_0 && \
 	./bootstrap.sh && \
     ./b2 install link=static
 
@@ -36,14 +43,6 @@ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/p
 	make && \
 	make install
 
-WORKDIR /home/dependencies
-RUN git clone https://github.com/openssl/openssl.git && \
-	cd openssl && \
-	git checkout OpenSSL_1_1_1-stable && \
-	./config && \
-	make depend && \
-	make all
-
 WORKDIR /home/dependencies
 RUN git clone --branch v2.13.6 https://github.com/catchorg/Catch2.git && \
 	cd Catch2 && \

.github/docker-images/base-images/fedora/Dockerfile

@@ -9,6 +9,14 @@ RUN dnf -y update \
 
 RUN mkdir /home/dependencies
 
+WORKDIR /home/dependencies
+RUN wget https://www.openssl.org/source/openssl-3.0.12.tar.gz \
+    && tar xzvf openssl-3.0.12.tar.gz \
+    && cd openssl-3.0.12 \
+    && ./config \
+    && make \
+    && make install
+
 WORKDIR /home/dependencies
 RUN wget https://github.com/madler/zlib/archive/v1.2.13.tar.gz -O /tmp/zlib-1.2.13.tar.gz && \
         tar xzvf /tmp/zlib-1.2.13.tar.gz && \
@@ -18,9 +26,9 @@ RUN wget https://github.com/madler/zlib/archive/v1.2.13.tar.gz -O /tmp/zlib-1.2.
         make install
 
 WORKDIR /home/dependencies
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz -O /tmp/boost.tar.gz && \
+RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.gz -O /tmp/boost.tar.gz && \
         tar xzvf /tmp/boost.tar.gz && \
-        cd boost_1_81_0 && \
+        cd boost_1_84_0 && \
         ./bootstrap.sh && \
     ./b2 install link=static
 
@@ -34,14 +42,6 @@ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/p
         make && \
         make install
 
-WORKDIR /home/dependencies
-RUN git clone https://github.com/openssl/openssl.git && \
-        cd openssl && \
-        git checkout OpenSSL_1_1_1-stable && \
-        ./config && \
-        make depend && \
-        make all
-
 WORKDIR /home/dependencies
 RUN git clone --branch v2.13.6 https://github.com/catchorg/Catch2.git && \
         cd Catch2 && \

.github/docker-images/base-images/ubi8/Dockerfile

@@ -3,11 +3,19 @@ FROM redhat/ubi8:latest AS base
 # Install Prerequisites
 
 RUN yum -y update \
-    && yum -y install git autoconf automake \
-	wget libtool libatomic curl make gcc-c++ unzip cmake python3 openssl-devel
+    && yum -y install git autoconf automake libatomic \
+	wget libtool curl make gcc-c++ unzip cmake python3 openssl-devel perl
 
 RUN mkdir /home/dependencies
 
+WORKDIR /home/dependencies
+RUN wget https://www.openssl.org/source/openssl-3.0.12.tar.gz \
+    && tar xzvf openssl-3.0.12.tar.gz \
+    && cd openssl-3.0.12 \
+    && ./config \
+    && make \
+    && make install
+
 WORKDIR /home/dependencies
 RUN wget https://github.com/madler/zlib/archive/v1.2.13.tar.gz -O /tmp/zlib-1.2.13.tar.gz && \
 	tar xzvf /tmp/zlib-1.2.13.tar.gz && \
@@ -17,9 +25,9 @@ RUN wget https://github.com/madler/zlib/archive/v1.2.13.tar.gz -O /tmp/zlib-1.2.
 	make install
 
 WORKDIR /home/dependencies
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz -O /tmp/boost.tar.gz && \
+RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.gz -O /tmp/boost.tar.gz && \
 	tar xzvf /tmp/boost.tar.gz && \
-	cd boost_1_81_0 && \
+	cd boost_1_84_0 && \
 	./bootstrap.sh && \
     ./b2 install link=static
 
@@ -33,14 +41,6 @@ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/p
 	make && \
 	make install
 
-WORKDIR /home/dependencies
-RUN git clone https://github.com/openssl/openssl.git && \
-	cd openssl && \
-	git checkout OpenSSL_1_1_1-stable && \
-	./config && \
-	make depend && \
-	make all
-
 WORKDIR /home/dependencies
 RUN git clone --branch v2.13.6 https://github.com/catchorg/Catch2.git && \
 	cd Catch2 && \

.github/docker-images/bin-images/amazonlinux/Dockerfile

@@ -0,0 +1,30 @@
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE} AS deploy
+
+###############################################################################
+# Copy and build local proxy
+###############################################################################
+
+COPY . /root/aws-iot-securetunneling-localproxy
+RUN mkdir -p /root/aws-iot-securetunneling-localproxy/build \
+    && cd /root/aws-iot-securetunneling-localproxy/build \
+    && cmake .. \
+    && make
+
+FROM amazonlinux:2023 AS minimum_size
+
+COPY --from=deploy /root/aws-iot-securetunneling-localproxy/build/bin/localproxy /root/bin/localproxy
+
+COPY ./.github/docker-images/oss-compliance /root/oss-compliance
+RUN HOME_DIR=/root \
+    && cd ${HOME_DIR}/oss-compliance \
+    && chmod +x ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh \
+    && chmod +x ${HOME_DIR}/oss-compliance/test/test-oss-compliance.sh \
+    && bash ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh ${HOME_DIR} \
+    && rm -rf ${HOME_DIR}/oss-compliance*
+
+# OS-specific commands
+RUN yum check-update; yum upgrade -y && \
+	yum install -y libatomic libicu
+
+ENTRYPOINT ["/root/bin/localproxy"]

.github/docker-images/bin-images/debian-ubuntu/Dockerfile

@@ -0,0 +1,30 @@
+ARG OS
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE} AS deploy
+
+###############################################################################
+# Copy and build local proxy
+###############################################################################
+
+COPY . /root/aws-iot-securetunneling-localproxy
+RUN mkdir -p /root/aws-iot-securetunneling-localproxy/build \
+    && cd /root/aws-iot-securetunneling-localproxy/build \
+    && cmake .. \
+    && make
+
+FROM ${OS} AS minimum_size
+
+COPY --from=deploy /root/aws-iot-securetunneling-localproxy/build/bin/localproxy /root/bin/localproxy
+
+COPY ./.github/docker-images/oss-compliance /root/oss-compliance
+RUN HOME_DIR=/root \
+    && cd ${HOME_DIR}/oss-compliance \
+    && chmod +x ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh \
+    && chmod +x ${HOME_DIR}/oss-compliance/test/test-oss-compliance.sh \
+    && bash ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh ${HOME_DIR} \
+    && rm -rf ${HOME_DIR}/oss-compliance*
+
+# OS-specific commands
+RUN apt update && apt upgrade -y && apt install -y ca-certificates && update-ca-certificates
+
+ENTRYPOINT ["/root/bin/localproxy"]

.github/docker-images/bin-images/ubi8/Dockerfile

@@ -0,0 +1,31 @@
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE} AS deploy
+
+###############################################################################
+# Copy and build local proxy
+###############################################################################
+
+COPY . /root/aws-iot-securetunneling-localproxy
+RUN mkdir -p /root/aws-iot-securetunneling-localproxy/build \
+    && cd /root/aws-iot-securetunneling-localproxy/build \
+    && cmake .. \
+    && make
+
+FROM redhat/ubi8:latest AS minimum_size
+
+COPY --from=deploy /root/aws-iot-securetunneling-localproxy/build/bin/localproxy /root/bin/localproxy
+
+COPY ./.github/docker-images/oss-compliance /root/oss-compliance
+RUN HOME_DIR=/root \
+    && cd ${HOME_DIR}/oss-compliance \
+    && chmod +x ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh \
+    && chmod +x ${HOME_DIR}/oss-compliance/test/test-oss-compliance.sh \
+    && bash ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh ${HOME_DIR} \
+    && rm -rf ${HOME_DIR}/oss-compliance*
+
+# OS-specific commands
+RUN yum check-update; yum upgrade -y && \
+	yum install -y libatomic libicu ca-certificates && \
+    update-ca-trust extract
+
+ENTRYPOINT ["/root/bin/localproxy"]