Upgrade to 9.6.3

fametec · Apr 20, 2020 · f7787d5 · f7787d5
1 parent b6dd3bd
commit f7787d5
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -1,14 +1,16 @@
-# Bacula 9.4.4 Container
+# Bacula 9.6.3 Container
 
 Deploy the bacula community edition on Docker Containers. 
 
 ## Images
 
-- [x] Bacula Catalog fametec/bacula-catalog
-- [x] Bacula Director fametec/bacula-director
-- [x] Bacula Storage Daemon fametec/bacula-storage
-- [x] Bacula File Daemon fametec/bacula-client
-- [x] Baculum Web Gui 
+- [x] Bacula Catalog fametec/bacula-catalog:9.6.3
+- [x] Bacula Director fametec/bacula-director:9.6.3
+- [x] Bacula Storage Daemon fametec/bacula-storage:9.6.3
+- [x] Bacula File Daemon fametec/bacula-client:9.6.3
+- [x] Baculum Web Gui fametec/baculum:9.6.3
+- [x] Postfix SMTP Relay fametec/postfix:latest
+- [x] SMTP2TG SMTP Relay to Telegram b3vis/docker-smtp2tg
 
 ## Install Docker 
 
@@ -45,7 +47,7 @@ docker-compose.yaml
     version: '3.1'
     services:
       db:
-        image: fametec/bacula-catalog:latest
+        image: fametec/bacula-catalog:9.6.3
         restart: unless-stopped
         environment:
           POSTGRES_PASSWORD: bacula
@@ -56,7 +58,7 @@ docker-compose.yaml
         ports:
           - 5432
       bacula-dir:
-        image: fametec/bacula-director:latest
+        image: fametec/bacula-director:9.6.3
         restart: unless-stopped
         volumes:
           - ./etc/bacula-dir.conf:/opt/bacula/etc/bacula-dir.conf:ro
@@ -66,7 +68,7 @@ docker-compose.yaml
         ports:
           - 9101
       bacula-sd:
-        image: fametec/bacula-storage:latest
+        image: fametec/bacula-storage:9.6.3
         restart: unless-stopped
         depends_on:
           - bacula-dir
@@ -76,7 +78,7 @@ docker-compose.yaml
         ports:
           - 9103
       bacula-fd:
-        image: fametec/bacula-client:latest
+        image: fametec/bacula-client:9.6.3
         restart: unless-stopped
         depends_on:
           - bacula-sd

diff --git a/docker/bacula-base/Dockerfile b/docker/bacula-base/Dockerfile
@@ -1,8 +1,8 @@
-FROM centos:7
+FROM centos:centos7.7.1908
 
 MAINTAINER Eduardo Fraga <[email protected]>
 
-ENV BACULA_VERSION 9.4.4
+ENV BACULA_VERSION 9.6.3
 
 ENV BACULA_KEY 5cee4d079821e
 
@@ -17,11 +17,13 @@ RUN sed -i s/BACULA_VERSION/$(echo $BACULA_VERSION)/g /etc/yum.repos.d/bacula-co
 
 RUN rpm -i https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
 
+RUN yum -y upgrade
+
 RUN yum -y install postgresql94 \
 	zip \
 	bzip2
 
-RUN yum install -y bacula-postgresql --exclude=bacula-mysql
+RUN yum install -y bacula-postgresql-$BACULA_VERSION --exclude=bacula-mysql
 
 RUN yum -y clean all && rm -rf /var/cache/yum
 

diff --git a/docker/bacula-catalog/Dockerfile b/docker/bacula-catalog/Dockerfile
@@ -1,4 +1,4 @@
-FROM fametec/bacula-base AS base
+FROM fametec/bacula-base:9.6.3 AS base
 
 FROM postgres:9.4
 

diff --git a/docker/bacula-dir/Dockerfile b/docker/bacula-dir/Dockerfile
@@ -1,4 +1,4 @@
-FROM fametec/bacula-base
+FROM fametec/bacula-base:9.6.3
 
 MAINTAINER [email protected]
 

diff --git a/docker/bacula-fd/Dockerfile b/docker/bacula-fd/Dockerfile
@@ -1,4 +1,4 @@
-FROM fametec/bacula-base
+FROM fametec/bacula-base:9.6.3
 
 VOLUME ["/opt/bacula/etc"]
 

diff --git a/docker/bacula-sd/Dockerfile b/docker/bacula-sd/Dockerfile
@@ -1,4 +1,4 @@
-FROM fametec/bacula-base
+FROM fametec/bacula-base:9.6.3
 
 RUN yum install -y bacula-cloud-storage --exclude=bacula-mysql
 

diff --git a/docker/baculum/Dockerfile b/docker/baculum/Dockerfile
@@ -1,11 +1,19 @@
-FROM fametec/bacula-base
+FROM fametec/bacula-base:9.6.3
 
 MAINTAINER [email protected]
 
 RUN rpm --import http://bacula.org/downloads/baculum/baculum.pub
 
 COPY baculum.repo /etc/yum.repos.d/baculum.repo
 
+RUN yum install -y \
+	epel-release \
+        yum-utils
+
+RUN yum install -y http://rpms.remirepo.net/enterprise/remi-release-7.rpm
+
+RUN yum-config-manager --enable remi-php73
+
 RUN yum install -y \
 	sudo \
 	baculum-common \
@@ -18,10 +26,7 @@ RUN yum -y clean all && rm -rf /var/cache/yum
 
 COPY sudoers-baculum /etc/sudoers.d/sudoers-baculum 
 
-RUN { \
-        echo '[Date]'; \
-        echo 'date.timezone = UTC ; '; \
-  } > /etc/php.d/timezone.ini
+COPY timezone.ini /etc/php.d/timezone.ini
 
 
 VOLUME ["/opt/bacula/etc","/etc/baculum"]

diff --git a/docker/baculum/baculum.repo b/docker/baculum/baculum.repo
@@ -4,8 +4,3 @@ baseurl=http://bacula.org/downloads/baculum/stable/centos
 gpgcheck=1
 enabled=1
 
-[baculumrepo]
-name=Baculum Fedora repository
-baseurl=http://bacula.org/downloads/baculum/stable/fedora
-gpgcheck=1
-enabled=1
diff --git a/docker/baculum/timezone.ini b/docker/baculum/timezone.ini
@@ -0,0 +1,2 @@
+[Date]
+date.timezone = Etc/UTC ;
diff --git a/docker/docker-compose-with-build.yml b/docker/docker-compose-with-build.yml
@@ -4,11 +4,11 @@ services:
 
   base: 
     build: bacula-base/
-    image: fametec/bacula-base:latest
+    image: fametec/bacula-base:9.6.3
 #    
   db:
     build: bacula-catalog/
-    image: fametec/bacula-catalog:latest
+    image: fametec/bacula-catalog:9.6.3
     restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: bacula
@@ -21,7 +21,7 @@ services:
 #
   bacula-dir:
     build: bacula-dir/
-    image: fametec/bacula-director:latest
+    image: fametec/bacula-director:9.6.3
     restart: unless-stopped
     volumes:
       - ./etc:/opt/bacula/etc:ro
@@ -32,7 +32,7 @@ services:
 #
   bacula-sd:
     build: bacula-sd/
-    image: fametec/bacula-storage:latest
+    image: fametec/bacula-storage:9.6.3
     restart: unless-stopped
     depends_on:
       - bacula-dir
@@ -44,19 +44,20 @@ services:
 #
   bacula-fd:
     build: bacula-fd/
-    image: fametec/bacula-client:latest
+    image: fametec/bacula-client:9.6.3
     restart: unless-stopped
     depends_on:
       - bacula-sd
       - bacula-dir
+      - db
     volumes:
       - ./etc:/opt/bacula/etc:ro
     ports:
       - 9102:9102
 #
   baculum:
     build: baculum/
-    image: fametec/baculum:latest
+    image: fametec/baculum:9.6.3
     restart: unless-stopped
     depends_on: 
       - db

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
 #    
   db:
-    image: fametec/bacula-catalog:latest
+    image: fametec/bacula-catalog:9.6.3
     restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: bacula
@@ -15,7 +15,7 @@ services:
       - 5432:5432
 #
   bacula-dir:
-    image: fametec/bacula-director:latest
+    image: fametec/bacula-director:9.6.3
     restart: unless-stopped
     volumes:
       - ./etc:/opt/bacula/etc:ro
@@ -25,7 +25,7 @@ services:
       - 9101:9101
 #
   bacula-sd:
-    image: fametec/bacula-storage:latest
+    image: fametec/bacula-storage:9.6.3
     restart: unless-stopped
     depends_on:
       - bacula-dir
@@ -36,18 +36,19 @@ services:
       - 9103:9103
 #
   bacula-fd:
-    image: fametec/bacula-client:latest
+    image: fametec/bacula-client:9.6.3
     restart: unless-stopped
     depends_on:
       - bacula-sd
       - bacula-dir
+      - db
     volumes:
       - ./etc:/opt/bacula/etc:ro
     ports:
       - 9102:9102
 #
 #  baculum:
-#    image: fametec/baculum:latest
+#    image: fametec/baculum:9.6.3
 #    restart: unless-stopped
 #    depends_on: 
 #      - db
@@ -60,7 +61,7 @@ services:
 #      - 9096:9096
 #
 #  gmail:
-#    image: fametec/postfix-gmail
+#    image: fametec/postfix:gmail
 #    restart: unless-stopped
 #    depends_on:
 #      - bacula-dir

diff --git a/docker/etc/bacula-dir.conf b/docker/etc/bacula-dir.conf
@@ -124,6 +124,7 @@ FileSet {
 #
     File = /opt/bacula/bin
     File = /opt/bacula
+    File = /opt/bacula/etc
   }
 
 #