.gitea/workflows/docker.yml

@@ -1,33 +0,0 @@
-name: Docker
-
-on:
-  push:
-    branches: [ "dev" ]
-  schedule:
-    - cron: '@weekly'
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
-      - uses: https://github.com/actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: https://github.com/docker/setup-buildx-action@v3
-        with:
-          config-inline: |
-            [registry."git.schreifuchs.ch"]
-              http = true
-              insecure = true            
-      - name: login
-        run: docker login -u schreifuchs -p ${{ secrets.REGISTRY_TOKEN }} git.schreifuchs.ch
-      - run: echo "NOW=$(date +'%Y-%m-%dT%H:%M:%S')"
-      - name: Build and push Docker image
-        uses: https://github.com/docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: "git.schreifuchs.ch/schreifuchs/webmin-samba-docker:${{ steps.date.outputs.date }},git.schreifuchs.ch/schreifuchs/webmin-samba-docker:latest"

Dockerfile

@@ -4,11 +4,9 @@ WORKDIR /
 COPY Service-check.sh .
 RUN apt-get update && apt-get upgrade -y
 RUN apt-get install apt-transport-https wget samba samba-common -y && \
-mkdir /media/storage /data /data/samba /data/webmin
-
-VOLUME /data
-
-RUN chmod -R 0777 /media/storage /data
+mkdir /media/storage /data /data/samba /data/webmin && \
+chmod 0777 /media/storage /data /data/samba /data/webmin && \
+ln -s /data/samba /etc/samba && ln -s /data/webmin /etc/webmin
 
 RUN echo "deb https://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list && \
 cd /root && \
@@ -26,5 +24,5 @@ RUN sed -i 's/10000/80/g' /etc/webmin/miniserv.conf && \
 sed -i 's/ssl=1/ssl=0/g' /etc/webmin/miniserv.conf 
 
 RUN echo root:webmin | chpasswd
-
-CMD [ "/bin/bash","/Service-check.sh" ]
+VOLUME /config 
+CMD [ "/bin/bash","/Service-check.sh" ]

README.md

@@ -1,6 +1,4 @@
 # webmin-samba-docker
-> this is a Fork of [piersonjarvis/webmin-samba-docker](https://github.com/piersonjarvis/webmin-samba-docker)
-
 Docker container based on ubuntu running a samba server, with a webmin webui.
 
 This container was build with simplisity in mind. 
@@ -8,5 +6,3 @@ This container was build with simplisity in mind.
 To run this container all you need to do is pass port 80 on the host to port 80 on the contrainer, and mount the volume you wish to share to /media/storage on the container.
 
 Example: docker run -d -p 80:80 -p 139:139 -p 445:445 -v /path/on/host:/media/storage piersonjarvis/webmin-samba
-
-config files are stored in /data. Add -v /path/on/host:/data to the docker run command to make the configuration files availble for edit on the host. 

Service-check.sh

@@ -1,12 +1,6 @@
 #!/bin/bash
 apt-get update && apt-get upgrade -y
 wait
-if [ ! -f /data/webmin/config ];
-then
-cp /etc/samba/* /data/samba/. && cp /etc/webmin/* /data/webmin/.
-fi
-wait
-ln -f /data/samba/* /etc/samba/ && ln -f /etc/webmin/* /data/webmin/
 service webmin start
 service smbd start
 service nmbd start
@@ -18,4 +12,4 @@ break
 else
 sleep 5m
 fi
-done
+done