feat: update base image

ElKiwos · Feb 22, 2024 · 21deffb · 21deffb
1 parent af69ca8
commit 21deffb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -20,15 +20,15 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }} 
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: elkiwi/samba-ad-dc:latest
+          tags: elkiwi/samba-ad-dc:v1.0.0
           platforms: linux/arm64,linux/amd64
           file: "Dockerfile"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:impish
+FROM ubuntu:noble
 
 ARG version
 ARG build_date
@@ -16,7 +16,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get clean && apt-get update && \
     apt-get install -y attr acl samba smbclient samba-vfs-modules winbind libnss-winbind libpam-winbind \
                        openssl
-RUN apt-get install -y ldap-utils ldb-tools cifs-utils smbldap-tools 
+RUN apt-get install -y ldap-utils ldb-tools cifs-utils smbldap-tools
 # tools for debugging
 RUN apt-get install -y vim bind9-host krb5-user iputils-ping iproute2
 RUN apt-get autoclean && \

diff --git a/build.sh b/build.sh
@@ -14,4 +14,4 @@ docker build \
         --build-arg "version=$version" \
         --build-arg "build_date=$build_date" \
         -t $gituser/docker-samba-ad-dc:${samba_version} .
-docker tag $gituser/docker-samba-ad-dc:${samba_version} $gituser/docker-samba-ad-ac:latest
+docker tag $gituser/docker-samba-ad-dc:${samba_version} $gituser/docker-samba-ad-ac:"v1.0.0"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -103,15 +103,15 @@ EOF
 	 # now join the domain
 	 if [ $RC -eq 0 ]; then
              echo -e "${GR} ************************************"
-             echo -e "${GR} JOINING DOMAIN ${SAMBA_DC_REALM} now" 
+             echo -e "${GR} JOINING DOMAIN ${SAMBA_DC_REALM} now"
              echo -e "${GR} ************************************"
 	     samba-tool domain join ${SAMBA_DC_REALM} DC -k yes
          fi
     fi
 
     if [ "${SAMBA_DNS_FORWARDER}" != "NONE" ]; then
         sed -i "/\[global\]/a \
-            \\\tdns forwarder = ${SAMBA_DNSFORWARDER}\
+            \\\tdns forwarder = ${SAMBA_DNS_FORWARDER}\
             " /etc/samba/smb.conf
     fi
 fi