chore: updated build files

Dockerfile.trunk

@@ -14,7 +14,6 @@ RUN apk add --no-cache \
   libressl-dev \
   openldap-dev \
   ninja \
-  paxmark \
   boost-dev \
   qt5-qtbase-dev \
   qt5-qtbase-postgresql \
@@ -42,8 +41,7 @@ RUN mkdir /quassel/build && \
 # build binaries
 RUN cd /quassel/build && \
     ninja && \
-    ninja install && \
-    paxmark -m /quassel/install/bin/quasselcore
+    ninja install
     
 # generate empty directory so docker doesn’t break
 RUN mkdir -p /quassel/install/lib_fix_docker_copy
@@ -103,12 +101,8 @@ ENV OIDENTD_CONF_FILE=""
 
 # Require SSL for remote (non-loopback) client connections.
 ENV SSL_REQUIRED="false"
-# Specify the base64 encoded data for the SSL certificate.
-ENV SSL_CERT_DATA=""
 # Specify the path to the SSL certificate.
 ENV SSL_CERT_FILE=""
-# Specify the base64 encoded data for the SSL certificate.
-ENV SSL_KEY_DATA=""
 # Specify the path to the SSL key.
 ENV SSL_KEY_FILE=""
 

Dockerfile.v0.14

@@ -14,7 +14,6 @@ RUN apk add --no-cache \
   libressl-dev \
   openldap-dev \
   ninja \
-  paxmark \
   boost-dev \
   qt5-qtbase-dev \
   qt5-qtbase-postgresql \
@@ -43,8 +42,7 @@ RUN mkdir /quassel/build && \
 # build binaries
 RUN cd /quassel/build && \
     ninja && \
-    ninja install && \
-    paxmark -m /quassel/install/bin/quasselcore
+    ninja install
     
 # generate empty directory so docker doesn’t break
 RUN mkdir -p /quassel/install/lib_fix_docker_copy
@@ -104,12 +102,8 @@ ENV OIDENTD_CONF_FILE=""
 
 # Require SSL for remote (non-loopback) client connections.
 ENV SSL_REQUIRED="false"
-# Specify the base64 encoded data for the SSL certificate.
-ENV SSL_CERT_DATA=""
 # Specify the path to the SSL certificate.
 ENV SSL_CERT_FILE=""
-# Specify the base64 encoded data for the SSL certificate.
-ENV SSL_KEY_DATA=""
 # Specify the path to the SSL key.
 ENV SSL_KEY_FILE=""
 

build.sh

-#!/bin/sh
-NAME=k8r.eu/justjanne/quassel-docker
-
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
-cd "$(dirname "$0")"
-
-docker build . \
-    -f Dockerfile.v0.14 \
-    --pull \
-    -t ${NAME}:v0.14.0 \
-    --build-arg BASE=alpine:3.10
-docker build . \
-    -f Dockerfile.v0.14 \
-    --pull \
-    -t ${NAME}:v0.14.0-aarch64 \
-    --build-arg BASE=multiarch/alpine:aarch64-v3.10
-docker build . \
-    -f Dockerfile.v0.14 \
-    --pull \
-    -t ${NAME}:v0.14.0-armhf \
-    --build-arg BASE=multiarch/alpine:armhf-v3.10
-
-docker tag ${NAME}:v0.14.0-aarch64 ${NAME}:aarch64
-docker tag ${NAME}:v0.14.0-armhf ${NAME}:armhf
-
-docker build . \
-    -f Dockerfile.trunk \
-    --pull \
-    -t ${NAME}:trunk \
-    --build-arg BASE=alpine:3.13
-docker build . \
-    -f Dockerfile.trunk \
-    --pull \
-    -t ${NAME}:trunk-aarch64 \
-    --build-arg BASE=multiarch/alpine:aarch64-v3.13
-docker build . \
-    -f Dockerfile.trunk \
-    --pull \
-    -t ${NAME}:trunk-armhf \
-    --build-arg BASE=multiarch/alpine:armhf-v3.13
-
-docker push ${NAME}:v0.14.0
-docker push ${NAME}:v0.14.0-aarch64
-docker push ${NAME}:v0.14.0-armhf
-docker push ${NAME}:aarch64
-docker push ${NAME}:armhf
-docker push ${NAME}:trunk
-docker push ${NAME}:trunk-aarch64
-docker push ${NAME}:trunk-armhf

kubernetes-template.yaml

@@ -123,7 +123,7 @@ spec:
     spec:
       containers:
       - envFrom:
-          configMapRef:
+        - configMapRef:
             name: quassel-core
         env:
         - name: DB_PGSQL_PASSWORD

src/docker-entrypoint.sh

@@ -89,13 +89,6 @@ if [[ "${SSL_REQUIRED}" == "true" ]]; then
   )
 fi
 
-# Specify the path to the SSL certificate.
-# format: base64 data
-if [[ ! -z "${SSL_CERT_DATA}" ]]; then
-  echo "${SSL_CERT_DATA}" | base64 -d > /config/_generated_tls.crt
-  export SSL_CERT_FILE=/config/_generated_tls.crt
-fi
-
 # Specify the path to the SSL certificate.
 # format: path
 if [[ ! -z "${SSL_CERT_FILE}" ]]; then
@@ -104,13 +97,6 @@ if [[ ! -z "${SSL_CERT_FILE}" ]]; then
   )
 fi
 
-# Specify the path to the SSL certificate.
-# format: base64 data
-if [[ ! -z "${SSL_KEY_DATA}" ]]; then
-  echo "${SSL_KEY_DATA}" | base64 -d > /config/_generated_tls.key
-  export SSL_KEY_FILE=/config/_generated_tls.key
-fi
-
 # Specify the path to the SSL key.
 # format: path
 if [[ ! -z "${SSL_KEY_FILE}" ]]; then