mirror of
https://github.com/Telecominfraproject/wlan-cloud-userportal.git
synced 2025-10-30 10:12:21 +00:00
Merge pull request #18 from Telecominfraproject/WIFI-10581-switch-images-to-debian-slim
[WIFI-10581] Switch microservice Docker images from Alpine to Debian-slim
This commit is contained in:
26
Dockerfile
26
Dockerfile
@@ -1,16 +1,16 @@
|
|||||||
ARG ALPINE_VERSION=3.16.2
|
ARG DEBIAN_VERSION=11.4-slim
|
||||||
ARG POCO_VERSION=poco-tip-v1
|
ARG POCO_VERSION=poco-tip-v1
|
||||||
ARG FMTLIB_VERSION=9.0.0
|
ARG FMTLIB_VERSION=9.0.0
|
||||||
ARG CPPKAFKA_VERSION=tip-v1
|
ARG CPPKAFKA_VERSION=tip-v1
|
||||||
ARG JSON_VALIDATOR_VERSION=2.1.0
|
ARG JSON_VALIDATOR_VERSION=2.1.0
|
||||||
|
|
||||||
FROM alpine:$ALPINE_VERSION AS build-base
|
FROM debian:$DEBIAN_VERSION AS build-base
|
||||||
|
|
||||||
RUN apk add --update --no-cache \
|
RUN apt-get update && apt-get install --no-install-recommends -y \
|
||||||
make cmake g++ git \
|
make cmake g++ git \
|
||||||
unixodbc-dev postgresql-dev mariadb-dev \
|
unixodbc-dev libpq-dev libmariadb-dev libmariadbclient-dev-compat \
|
||||||
librdkafka-dev boost-dev openssl-dev \
|
librdkafka-dev libboost-all-dev libssl-dev \
|
||||||
zlib-dev nlohmann-json
|
zlib1g-dev nlohmann-json3-dev ca-certificates
|
||||||
|
|
||||||
FROM build-base AS poco-build
|
FROM build-base AS poco-build
|
||||||
|
|
||||||
@@ -90,21 +90,21 @@ WORKDIR /owsub/cmake-build
|
|||||||
RUN cmake ..
|
RUN cmake ..
|
||||||
RUN cmake --build . --config Release -j8
|
RUN cmake --build . --config Release -j8
|
||||||
|
|
||||||
FROM alpine:$ALPINE_VERSION
|
FROM debian:$DEBIAN_VERSION
|
||||||
|
|
||||||
ENV OWSUB_USER=owsub \
|
ENV OWSUB_USER=owsub \
|
||||||
OWSUB_ROOT=/owsub-data \
|
OWSUB_ROOT=/owsub-data \
|
||||||
OWSUB_CONFIG=/owsub-data
|
OWSUB_CONFIG=/owsub-data
|
||||||
|
|
||||||
RUN addgroup -S "$OWSUB_USER" && \
|
RUN useradd "$OWSUB_USER"
|
||||||
adduser -S -G "$OWSUB_USER" "$OWSUB_USER"
|
|
||||||
|
|
||||||
RUN mkdir /openwifi
|
RUN mkdir /openwifi
|
||||||
RUN mkdir -p "$OWSUB_ROOT" "$OWSUB_CONFIG" && \
|
RUN mkdir -p "$OWSUB_ROOT" "$OWSUB_CONFIG" && \
|
||||||
chown "$OWSUB_USER": "$OWSUB_ROOT" "$OWSUB_CONFIG"
|
chown "$OWSUB_USER": "$OWSUB_ROOT" "$OWSUB_CONFIG"
|
||||||
|
|
||||||
RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \
|
RUN apt-get update && apt-get install --no-install-recommends -y \
|
||||||
mariadb-connector-c libpq unixodbc postgresql-client
|
librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
|
||||||
|
libmariadb-dev-compat libpq5 unixodbc
|
||||||
|
|
||||||
COPY test_scripts/curl/cli /cli
|
COPY test_scripts/curl/cli /cli
|
||||||
|
|
||||||
@@ -113,12 +113,14 @@ COPY docker-entrypoint.sh /
|
|||||||
COPY wait-for-postgres.sh /
|
COPY wait-for-postgres.sh /
|
||||||
|
|
||||||
RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentral-deploy/main/docker-compose/certs/restapi-ca.pem \
|
RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentral-deploy/main/docker-compose/certs/restapi-ca.pem \
|
||||||
-O /usr/local/share/ca-certificates/restapi-ca-selfsigned.pem
|
-O /usr/local/share/ca-certificates/restapi-ca-selfsigned.crt
|
||||||
|
|
||||||
COPY --from=owsub-build /owsub/cmake-build/owsub /openwifi/owsub
|
COPY --from=owsub-build /owsub/cmake-build/owsub /openwifi/owsub
|
||||||
COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib /usr/local/lib
|
COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib /usr/local/lib
|
||||||
COPY --from=poco-build /poco/cmake-build/lib /usr/local/lib
|
COPY --from=poco-build /poco/cmake-build/lib /usr/local/lib
|
||||||
|
|
||||||
|
RUN ldconfig
|
||||||
|
|
||||||
EXPOSE 16006 17006 16106
|
EXPOSE 16006 17006 16106
|
||||||
|
|
||||||
ENTRYPOINT ["/docker-entrypoint.sh"]
|
ENTRYPOINT ["/docker-entrypoint.sh"]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ "$SELFSIGNED_CERTS" = 'true' ]; then
|
if [ "$SELFSIGNED_CERTS" = 'true' ]; then
|
||||||
@@ -47,7 +47,7 @@ if [ "$1" = '/openwifi/owsub' -a "$(id -u)" = '0' ]; then
|
|||||||
if [ "$RUN_CHOWN" = 'true' ]; then
|
if [ "$RUN_CHOWN" = 'true' ]; then
|
||||||
chown -R "$OWSUB_USER": "$OWSUB_ROOT" "$OWSUB_CONFIG"
|
chown -R "$OWSUB_USER": "$OWSUB_ROOT" "$OWSUB_CONFIG"
|
||||||
fi
|
fi
|
||||||
exec su-exec "$OWSUB_USER" "$@"
|
exec gosu "$OWSUB_USER" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
# wait-for-postgres.sh
|
# wait-for-postgres.sh
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
@@ -20,7 +20,7 @@ if [ "$1" = '/openwifi/owsub' -a "$(id -u)" = '0' ]; then
|
|||||||
if [ "$RUN_CHOWN" = 'true' ]; then
|
if [ "$RUN_CHOWN" = 'true' ]; then
|
||||||
chown -R "$OWSUB_USER": "$OWSUB_ROOT" "$OWSUB_CONFIG"
|
chown -R "$OWSUB_USER": "$OWSUB_ROOT" "$OWSUB_CONFIG"
|
||||||
fi
|
fi
|
||||||
exec su-exec "$OWSUB_USER" "$@"
|
exec gosu "$OWSUB_USER" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user