diff --git a/Dockerfile b/Dockerfile index 777e4a8..bfef6e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,17 @@ -ARG ALPINE_VERSION=3.16.2 +ARG DEBIAN_VERSION=11.4-slim ARG POCO_VERSION=poco-tip-v1 ARG FMTLIB_VERSION=9.0.0 ARG CPPKAFKA_VERSION=tip-v1 ARG JSON_VALIDATOR_VERSION=2.1.0 ARG AWS_SDK_VERSION=1.9.315 -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 \ - unixodbc-dev postgresql-dev mariadb-dev \ - librdkafka-dev boost-dev openssl-dev \ - zlib-dev nlohmann-json \ - curl-dev + unixodbc-dev libpq-dev libmariadb-dev libmariadbclient-dev-compat \ + librdkafka-dev libboost-all-dev libssl-dev \ + zlib1g-dev nlohmann-json3-dev ca-certificates libcurl4-openssl-dev FROM build-base AS poco-build @@ -113,21 +112,21 @@ RUN cmake .. \ -DBUILD_SHARED_LIBS=ON RUN cmake --build . --config Release -j8 -FROM alpine:$ALPINE_VERSION +FROM debian:$DEBIAN_VERSION ENV OWFMS_USER=owfms \ OWFMS_ROOT=/owfms-data \ OWFMS_CONFIG=/owfms-data -RUN addgroup -S "$OWFMS_USER" && \ - adduser -S -G "$OWFMS_USER" "$OWFMS_USER" +RUN useradd "$OWFMS_USER" RUN mkdir /openwifi RUN mkdir -p "$OWFMS_ROOT" "$OWFMS_CONFIG" && \ chown "$OWFMS_USER": "$OWFMS_ROOT" "$OWFMS_CONFIG" -RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \ - mariadb-connector-c libpq unixodbc postgresql-client +RUN apt-get update && apt-get install --no-install-recommends -y \ + librdkafka++1 gosu gettext ca-certificates bash jq curl wget \ + libmariadb-dev-compat libpq5 unixodbc COPY readiness_check /readiness_check COPY test_scripts/curl/cli /cli diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index aa28dd3..a24508d 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e if [ "$SELFSIGNED_CERTS" = 'true' ]; then @@ -51,7 +51,7 @@ if [ "$1" = '/openwifi/owfms' -a "$(id -u)" = '0' ]; then if [ "$RUN_CHOWN" = 'true' ]; then chown -R "$OWFMS_USER": "$OWFMS_ROOT" "$OWFMS_CONFIG" fi - exec su-exec "$OWFMS_USER" "$@" + exec gosu "$OWFMS_USER" "$@" fi exec "$@" diff --git a/wait-for-postgres.sh b/wait-for-postgres.sh index 288d616..59ed58c 100755 --- a/wait-for-postgres.sh +++ b/wait-for-postgres.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # wait-for-postgres.sh set -e @@ -20,7 +20,7 @@ if [ "$1" = '/openwifi/owfms' -a "$(id -u)" = '0' ]; then if [ "$RUN_CHOWN" = 'true' ]; then chown -R "$OWFMS_USER": "$OWFMS_ROOT" "$OWFMS_CONFIG" fi - exec su-exec "$OWFMS_USER" "$@" + exec gosu "$OWFMS_USER" "$@" fi exec "$@"