test bareos 23 sur alpine

Author: alainabbas

.github/workflows/docker-image.yml

@@ -25,6 +25,23 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      # Process for the `storage` subfolder
+      - name: Extract metadata (tags, labels) for Docker (storage)
+        id: metaStorage
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/bareos-storage
+          tags: |
+            # set latest tag for default branch
+            type=raw,value=latest,enable={{is_default_branch}}
+      - name: Build and push Docker image (storage)
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: ./storage
+          push: true
+          tags: ${{ steps.metaStorage.outputs.tags }}
+          labels: ${{ steps.metaStorage.outputs.labels }}
+          platforms: linux/amd64
 
       # Process for the `director` subfolder
       - name: Extract metadata (tags, labels) for Docker (director)
@@ -45,4 +62,21 @@ jobs:
           labels: ${{ steps.metaDirector.outputs.labels }}
           platforms: linux/amd64
 
+      # Process for the `webui` subfolder
+      - name: Extract metadata (tags, labels) for Docker (webui)
+        id: metaWebui
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/bareos-webui
+          tags: |
+            # set latest tag for default branch
+            type=raw,value=latest,enable={{is_default_branch}}
 
+      - name: Build and push Docker image (webui)
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: ./webui
+          push: true
+          tags: ${{ steps.metaWebui.outputs.tags }}
+          labels: ${{ steps.metaWebui.outputs.labels }}
+          platforms: linux/amd64

director/Dockerfile

@@ -1,7 +1,7 @@
 # Bareos director Dockerfile
-FROM ubuntu:focal
+FROM alpine:3.21
 
-LABEL maintainer="barcus@tou.nu"
+LABEL maintainer="aa@libertech.fr"
 
 ARG BUILD_DATE
 ARG NAME
@@ -15,36 +15,13 @@ LABEL org.label-schema.schema-version="1.0" \
       org.label-schema.vcs-url="https://github.com/barcus/bareos" \
       org.label-schema.version=$VERSION
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV BAREOS_KEY http://download.bareos.org/bareos/release/21/xUbuntu_20.04/Release.key
-ENV BAREOS_REPO http://download.bareos.org/bareos/release/21/xUbuntu_20.04/
-ENV BAREOS_DPKG_CONF bareos-database-common bareos-database-common
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-RUN apt-get update -qq \
- && apt-get -qq -y install --no-install-recommends curl tzdata gnupg awscli openssh-client\
- && curl -Ls $BAREOS_KEY -o /tmp/bareos.key \
- && apt-key --keyring /etc/apt/trusted.gpg.d/breos-keyring.gpg \
-    add /tmp/bareos.key \
- && echo "deb $BAREOS_REPO /" > /etc/apt/sources.list.d/bareos.list \
- && echo "${BAREOS_DPKG_CONF}/dbconfig-install boolean false" \
-    | debconf-set-selections \
- && echo "${BAREOS_DPKG_CONF}/install-error select ignore" \
-    | debconf-set-selections \
- && echo "${BAREOS_DPKG_CONF}/database-type select pgsql" \
-    | debconf-set-selections \
- && echo "${BAREOS_DPKG_CONF}/missing-db-package-error select ignore" \
-    | debconf-set-selections \
- && echo 'postfix postfix/main_mailer_type select No configuration' \
-    | debconf-set-selections \
- && apt-get update -qq \
- && apt-get install -qq -y --no-install-recommends \
-    bareos postgresql-client bareos-tools \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+
+RUN apk add --no-cache bareos bareos-postgresql postgresql-client curl tzdata tar
 
 RUN tar czf /bareos-dir.tgz /etc/bareos
+RUN mkdir /run/bareos \
+ && chown bareos /run/bareos
 
 COPY webhook-notify /usr/local/bin/webhook-notify
 RUN chmod u+x /usr/local/bin/webhook-notify
@@ -55,7 +32,7 @@ RUN chmod u+x /docker-entrypoint.sh
 EXPOSE 9101
 
 VOLUME /etc/bareos
+VOLUME /var/lib/bareos
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/usr/sbin/bareos-dir", "-u", "bareos", "-f"]
-

director/webhook-notify

@@ -1,6 +1,5 @@
-#!/usr/bin/env sh
 
-job_type=$1
+b_type=$1
 job_status=$2
 job_client=$3
 job_level=$4

storage/Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile Bareos storage daemon
-FROM arm32v7/alpine:3.17.0
+FROM alpine:3.21
 
-LABEL maintainer="barcus@tou.nu"
+LABEL maintainer="aa@libertech.fr"
 
 ARG BUILD_DATE
 ARG NAME
@@ -12,18 +12,16 @@ LABEL org.label-schema.schema-version="1.0" \
       org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.name=$NAME \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/barcus/bareos" \
+      org.label-schema.vcs-url="https://github.com/Libertech-FR/bareos" \
       org.label-schema.version=$VERSION
 
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 
-RUN sed -i 's|https://dl-cdn.alpinelinux.org/alpine/v3.[^/]*\/|https://dl-cdn.alpinelinux.org/alpine/edge/|' /etc/apk/repositories
-
 RUN apk add --no-cache bareos bareos-storage tar
 
 RUN tar czf /bareos-sd.tgz /etc/bareos/bareos-sd.d
 RUN mkdir /run/bareos \
-      && chown bareos /run/bareos
+ && chown bareos /run/bareos
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod u+x /docker-entrypoint.sh
@@ -35,3 +33,4 @@ VOLUME /var/lib/bareos/storage
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/usr/sbin/bareos-sd", "-u", "bareos", "-f"]
+

storage/docker-entrypoint.sh

@@ -20,3 +20,4 @@ find /dev -regex "/dev/tape/.*" ! -user bareos -exec chown bareos {} \;
 
 # Run Dockerfile CMD
 exec "$@"
+

webui/Dockerfile

@@ -1,5 +1,5 @@
 # Bareos Web-ui Dockerfile
-FROM arm32v7/alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache bareos-webui-nginx
 

webui/docker-entrypoint.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env ash
+
+if [ ! -f /etc/bareos-webui/bareos-config.control ]
+  then
+  tar xfvz /bareos-webui-config.tgz
+
+  # Update bareos-webui config
+  sed -i "s/diraddress = \"localhost\"/diraddress = \"${BAREOS_DIR_HOST}\"/" /etc/bareos-webui/directors.ini
+
+  # Control file
+  touch /etc/bareos-webui/bareos-config.control
+fi
+
+if [ ! -f /usr/share/bareos-webui/bareos-config.control ]
+  then
+  tar xfvz /bareos-webui-code.tgz
+  touch /usr/share/bareos-webui/bareos-config.control
+fi
+
+# Fix nginx 'client_max_body_size'
+sed -i "s#client_max_body_size 1m#client_max_body_size 20m#" /etc/nginx/nginx.conf
+
+# set php-fpm host andd port
+sed -i "s/fastcgi_pass 127.0.0.1:9000;/fastcgi_pass ${PHP_FPM_HOST}:${PHP_FPM_PORT};/" /etc/nginx/http.d/bareos-webui.conf
+
+exec "$@"