Merge pull request #2 from eftechcombr/upgrade/15.0.2

Upgrade to 15.0.2

.github/workflows/bacula-build-and-publish.yml

@@ -21,7 +21,7 @@ env:
   REGISTRY: "docker.io"
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
-  VERSION: "13.0.3"
+  VERSION: "15.0.2"
 
 
 

README.md

@@ -1,15 +1,13 @@
-# Bacula 13.0.3 Container
+# Bacula 15.0.2 Container
 
 Deploy the bacula community edition on Docker Containers. 
 
 ## Images
 
-- [x] Bacula Catalog                    eftechcombr/bacula:13.0.3-catalog
+- [x] Bacula Catalog                    eftechcombr/bacula:15.0.2-catalog
-- [x] Bacula Director                   eftechcombr/bacula:13.0.3-director
+- [x] Bacula Director                   eftechcombr/bacula:15.0.2-director
-- [x] Bacula Storage Daemon             eftechcombr/bacula:13.0.3-storage
+- [x] Bacula Storage Daemon             eftechcombr/bacula:15.0.2-storage
-- [x] Bacula File Daemon                eftechcombr/bacula:13.0.3-client
+- [x] Bacula File Daemon                eftechcombr/bacula:15.0.2-client
-- [ ] Bacula File Daemon S3             eftechcombr/bacula:13.0.3-client-s3fs (BETA)
-- [ ] Bacula File Daemon Git            eftechcombr/bacula:13.0.3-client-git (BETA)
 - [x] Baculum Web Gui                   eftechcombr/baculum:11.0.6-web
 - [x] Baculum API                       eftechcombr/baculum:11.0.6-api
 - [x] Postfix SMTP Relay                eftechcombr/postfix:latest
@@ -55,7 +53,7 @@ docker-compose.yaml
     version: '3.1'
     services:
       db:
-        image: eftechcombr/bacula:13.0.3-catalog
+        image: eftechcombr/bacula:15.0.2-catalog
         restart: unless-stopped
         environment:
           POSTGRES_PASSWORD: bacula
@@ -66,7 +64,7 @@ docker-compose.yaml
         ports:
           - 5432
       bacula-dir:
-        image: eftechcombr/bacula:13.0.3-director
+        image: eftechcombr/bacula:15.0.2-director
         restart: unless-stopped
         volumes:
           - ./etc/bacula-dir.conf:/opt/bacula/etc/bacula-dir.conf:ro
@@ -76,7 +74,7 @@ docker-compose.yaml
         ports:
           - 9101
       bacula-sd:
-        image: eftechcombr/bacula:13.0.3-storage
+        image: eftechcombr/bacula:15.0.2-storage
         restart: unless-stopped
         depends_on:
           - bacula-dir
@@ -86,7 +84,7 @@ docker-compose.yaml
         ports:
           - 9103
       bacula-fd:
-        image: eftechcombr/bacula:13.0.3-client
+        image: eftechcombr/bacula:15.0.2-client
         restart: unless-stopped
         depends_on:
           - bacula-sd

docker/.gitignore

@@ -1,2 +1,3 @@
 working/*
 etc/baculum/Config-web-apache/session.dump
+.env

docker/Dockerfile

@@ -1,21 +1,20 @@
-FROM debian:11
+FROM debian:12
-
-ENV BACULA_VERSION 13.0.3
-
-ENV DISTRO bullseye
 
+ENV BACULA_VERSION 15.0.2
+ENV DISTRO bookworm
 ENV DEBIAN_FRONTEND noninteractive
+ENV EMAIL suporte@eftech.com.br
 
 # get your key on: https://www.bacula.org/bacula-binary-package-download/
 ENV BACULA_KEY 5cee4d079821e
 
-ENV EMAIL suporte@eftech.com.br
+RUN   apt-get install apt-transport-https && \
-
+  apt-get update && \
-RUN apt update && \
+  apt-get -y install gnupg2 curl dbconfig-common && \
-  apt -y install gnupg2 curl && \
   curl https://bacula.org/downloads/Bacula-4096-Distribution-Verification-key.asc | apt-key add - && \
   echo "deb https://www.bacula.org/packages/${BACULA_KEY}/debs/${BACULA_VERSION} ${DISTRO} main" > /etc/apt/sources.list.d/bacula-community.list && \
-  apt update && \
+  apt-get update
-  apt -y install dbconfig-pgsql bacula-postgresql
+  
+# RUN apt-get -y install bacula-postgresql
+# RUN for i in `ls /opt/bacula/bin`; do if [ ! -z /usr/sbin/$i ]; then ln -s /opt/bacula/bin/$i /usr/sbin/$i; fi; done 
 
-RUN for i in `ls /opt/bacula/bin`; do if test -z /usr/sbin/$i; then ln -s /opt/bacula/bin/$i /usr/sbin/$i; fi; done 

docker/bacula-base/bacula-community.repo

@@ -1,6 +0,0 @@
-[Bacula-Community]
-name=CentOS - Bacula - Community
-baseurl=https://www.bacula.org/packages/BACULA_KEY/rpms/BACULA_VERSION/el7/
-enabled=1
-protect=0
-gpgcheck=0

docker/bacula-catalog/Dockerfile

@@ -1,6 +1,8 @@
-FROM eftechcombr/bacula:13.0.3-base AS base
+FROM eftechcombr/bacula:15.0.2-base AS base
 
-FROM postgres:13.7
+RUN apt-get -y install bacula-postgresql
+
+FROM postgres:15
 
 ENV POSTGRES_PASSWORD bacula
 

docker/bacula-dir/Dockerfile

@@ -1,4 +1,7 @@
-FROM eftechcombr/bacula:13.0.3-base
+FROM eftechcombr/bacula:15.0.2-base
+
+RUN apt-get -y install bacula-postgresql \
+  && for i in `ls /opt/bacula/bin`; do if [ ! -z /usr/sbin/$i ]; then ln -s /opt/bacula/bin/$i /usr/sbin/$i; fi; done 
 
 VOLUME ["/opt/bacula/etc"]
 

docker/bacula-fd/Dockerfile

@@ -1,4 +1,6 @@
-FROM eftechcombr/bacula:13.0.3-base
+FROM eftechcombr/bacula:15.0.2-base
+
+RUN apt-get -y install bacula-common bacula-client
 
 VOLUME ["/opt/bacula/etc"]
 

docker/bacula-fd/Dockerfile-git

@@ -1,4 +1,4 @@
-FROM eftechcombr/bacula:13.0.3-base
+FROM eftechcombr/bacula:15.0.2-base
 
 ENV USERNAME ${USERNAME}
 

docker/bacula-fd/Dockerfile-s3fs

@@ -1,4 +1,4 @@
-FROM eftechcombr/bacula:13.0.3-base
+FROM eftechcombr/bacula:15.0.2-base
 
 ENV AWS_S3_ACCESS_KEY_ID "${AWS_S3_ACCESS_KEY_ID}"
 

docker/bacula-sd/Dockerfile

@@ -1,6 +1,6 @@
-FROM eftechcombr/bacula:13.0.3-base
+FROM eftechcombr/bacula:15.0.2-base
 
-RUN apt -y install bacula-cloud-storage-common bacula-cloud-storage-s3 bacula-aligned
+RUN apt-get -y install bacula-cloud-storage-common bacula-cloud-storage-s3 bacula-aligned
 
 VOLUME ["/opt/bacula/etc"]
 

docker/baculum-api/Dockerfile

@@ -1,4 +1,4 @@
-FROM eftechcombr/bacula:13.0.3-base
+FROM eftechcombr/bacula:15.0.2-director
 
 RUN curl https://www.bacula.org/downloads/baculum/baculum.pub | apt-key add -
 
@@ -36,3 +36,4 @@ EXPOSE 9096/tcp
 RUN mkdir -p /run/php
 
 CMD ["/usr/bin/supervisord"]
+

docker/baculum-api/confs/supervisord.conf

@@ -18,8 +18,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 serverurl=unix:///var/run/supervisor.sock 
 
 
-[program:php-fpm7.4]
+[program:php-fpm8.2]
-command=/usr/sbin/php-fpm7.4 --nodaemonize -c /etc/php/7.4/fpm/php-fpm.conf
+command=/usr/sbin/php-fpm8.2 --nodaemonize -c /etc/php/8.2/fpm/php-fpm.conf
 priority=50
 autorestart=true
 

docker/baculum-web/Dockerfile

@@ -1,4 +1,4 @@
-FROM eftechcombr/bacula:13.0.3-base
+FROM eftechcombr/bacula:15.0.2-director
 
 RUN curl https://www.bacula.org/downloads/baculum/baculum.pub | apt-key add -
 
@@ -9,7 +9,7 @@ RUN apt update && \
     php-bcmath \
 	php*-mbstring \
 	php-fpm \
-	libapache2-mod-php7.4 \
+	libapache2-mod-php \
 	baculum-api \
 	baculum-api-apache2 \
 	baculum-common \
@@ -24,7 +24,7 @@ RUN usermod -aG bacula www-data && \
   chown -R www-data:bacula /opt/bacula/working /opt/bacula/etc && \
   chmod -R g+rwx /opt/bacula/working /opt/bacula/etc && \
   a2enmod rewrite && \
-  a2enmod php7.4 && \
+  a2enmod php8.2 && \
   a2ensite baculum-web
 
 COPY timezone.ini /etc/php.d/timezone.ini

docker/baculum-web/confs/supervisord.conf

@@ -18,8 +18,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 serverurl=unix:///var/run/supervisor.sock 
 
 
-[program:php-fpm7.4]
+[program:php-fpm8.2]
-command=/usr/sbin/php-fpm7.4 --nodaemonize -c /etc/php/7.4/fpm/php-fpm.conf
+command=/usr/sbin/php-fpm8.2 --nodaemonize -c /etc/php/8.2/fpm/php-fpm.conf
 priority=50
 autorestart=true
 

docker/docker-compose-with-build.yml

@@ -1,14 +1,14 @@
-version: '3.1'
-#
 services:
-
+#
   base: 
-    build: bacula-base/
+    build: 
-    image: eftechcombr/bacula:13.0.3-base
+      context: .
+      dockerfile: Dockerfile 
+    image: eftechcombr/bacula:15.0.2-base
 #    
   db:
     build: bacula-catalog/
-    image: eftechcombr/bacula:13.0.3-catalog
+    image: eftechcombr/bacula:15.0.2-catalog
     restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: bacula
@@ -21,7 +21,7 @@ services:
 #
   bacula-dir:
     build: bacula-dir/
-    image: eftechcombr/bacula:13.0.3-director
+    image: eftechcombr/bacula:15.0.2-director
     restart: unless-stopped
     volumes:
       - ./etc:/opt/bacula/etc:ro
@@ -32,7 +32,7 @@ services:
 #
   bacula-sd:
     build: bacula-sd/
-    image: eftechcombr/bacula:13.0.3-storage
+    image: eftechcombr/bacula:15.0.2-storage
     restart: unless-stopped
     depends_on:
       - bacula-dir
@@ -44,7 +44,7 @@ services:
 #
   bacula-fd:
     build: bacula-fd/
-    image: eftechcombr/bacula:13.0.3-client
+    image: eftechcombr/bacula:15.0.2-client
     restart: unless-stopped
     depends_on:
       - bacula-sd
@@ -59,7 +59,7 @@ services:
   #   build: 
   #     context: bacula-fd/
   #     dockerfile: Dockerfile-git
-  #   image: eftechcombr/bacula:13.0.3-client-git
+  #   image: eftechcombr/bacula:15.0.2-client-git
   #   restart: unless-stopped
   #   environment: 
   #     USERNAME: <username>
@@ -75,7 +75,7 @@ services:
   #   build: 
   #     context: bacula-fd/
   #     dockerfile: Dockerfile-s3fs
-  #   image: eftechcombr/bacula:13.0.3-client-s3fs
+  #   image: eftechcombr/bacula:15.0.2-client-s3fs
   #   restart: unless-stopped
   #   cap_add:
   #     - SYS_ADMIN

docker/docker-compose.yml

@@ -1,9 +1,7 @@
-version: '3.1'
-#
 services:
 
   db:
-    image: eftechcombr/bacula:13.0.3-catalog
+    image: eftechcombr/bacula:15.0.2-catalog
     restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: bacula
@@ -15,7 +13,7 @@ services:
       - 5432:5432
 #
   bacula-dir:
-    image: eftechcombr/bacula:13.0.3-director
+    image: eftechcombr/bacula:15.0.2-director
     restart: unless-stopped
     volumes:
       - ./etc:/opt/bacula/etc:ro
@@ -25,7 +23,7 @@ services:
       - 9101:9101
 #
   bacula-sd:
-    image: eftechcombr/bacula:13.0.3-storage
+    image: eftechcombr/bacula:15.0.2-storage
     restart: unless-stopped
     depends_on:
       - bacula-dir
@@ -36,7 +34,7 @@ services:
       - 9103:9103
 #
   bacula-fd:
-    image: eftechcombr/bacula:13.0.3-client
+    image: eftechcombr/bacula:15.0.2-client
     restart: unless-stopped
     depends_on:
       - bacula-sd

kubernetes/deployment-bacula-dir.yaml

@@ -23,7 +23,7 @@ spec:
         app: bacula-dir
     spec:
       containers:
-      - image: docker.io/eftechcombr/bacula:13.0.3-director
+      - image: docker.io/eftechcombr/bacula:15.0.2-director
         name: bacula-dir
         ports:
         - containerPort: 9101

kubernetes/deployment-bacula-fd.yaml

@@ -18,7 +18,7 @@ spec:
         app: bacula-fd
     spec:
       containers:
-      - image: docker.io/eftechcombr/bacula:13.0.3-client
+      - image: docker.io/eftechcombr/bacula:15.0.2-client
         name: bacula-fd
         ports:
         - containerPort: 9102

kubernetes/deployment-bacula-sd.yaml

@@ -18,7 +18,7 @@ spec:
         app: bacula-sd
     spec:
       containers:
-      - image: docker.io/eftechcombr/bacula:13.0.3-storage
+      - image: docker.io/eftechcombr/bacula:15.0.2-storage
         name: bacula-sd
         ports:
         - containerPort: 9103

kubernetes/statefulset-postgresql.yaml

@@ -50,7 +50,7 @@ spec:
           value: "bacula"
         - name: POSTGRES_INITDB_ARGS
           value: '--encoding=SQL_ASCII --lc-collate=C --lc-ctype=C'
-        image: docker.io/eftechcombr/bacula:13.0.3-catalog
+        image: docker.io/eftechcombr/bacula:15.0.2-catalog
         imagePullPolicy: IfNotPresent
         name: postgresql
         ports: