Удалил лишние файлы, актуализировал имя владельца

2023-03-05 13:17:53 +03:00 · 2023-03-05 13:17:53 +03:00 · 967d5534e8
commit 967d5534e8
parent 613a23edd6
9 changed files with 3 additions and 187 deletions
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 FROM alpine
-MAINTAINER David Personette <dperson@gmail.com>
+MAINTAINER Struchkov Mark <mark@struchkov.dev>

 # Install samba
 RUN apk --no-cache --no-progress upgrade && \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -1,69 +0,0 @@
-FROM arm64v8/alpine
-COPY qemu-aarch64-static /usr/bin/
-MAINTAINER David Personette <dperson@gmail.com>
-
-# Install samba
-RUN apk --no-cache --no-progress upgrade && \
-    apk --no-cache --no-progress add bash samba shadow tini tzdata && \
-    addgroup -S smb && \
-    adduser -S -D -H -h /tmp -s /sbin/nologin -G smb -g 'Samba User' smbuser &&\
-    file="/etc/samba/smb.conf" && \
-    sed -i 's|^;* *\(log file = \).*|   \1/dev/stdout|' $file && \
-    sed -i 's|^;* *\(load printers = \).*|   \1no|' $file && \
-    sed -i 's|^;* *\(printcap name = \).*|   \1/dev/null|' $file && \
-    sed -i 's|^;* *\(printing = \).*|   \1bsd|' $file && \
-    sed -i 's|^;* *\(unix password sync = \).*|   \1no|' $file && \
-    sed -i 's|^;* *\(preserve case = \).*|   \1yes|' $file && \
-    sed -i 's|^;* *\(short preserve case = \).*|   \1yes|' $file && \
-    sed -i 's|^;* *\(default case = \).*|   \1lower|' $file && \
-    sed -i '/Share Definitions/,$d' $file && \
-    echo '   pam password change = yes' >>$file && \
-    echo '   map to guest = bad user' >>$file && \
-    echo '   usershare allow guests = yes' >>$file && \
-    echo '   create mask = 0664' >>$file && \
-    echo '   force create mode = 0664' >>$file && \
-    echo '   directory mask = 0775' >>$file && \
-    echo '   force directory mode = 0775' >>$file && \
-    echo '   force user = smbuser' >>$file && \
-    echo '   force group = smb' >>$file && \
-    echo '   follow symlinks = yes' >>$file && \
-    echo '   load printers = no' >>$file && \
-    echo '   printing = bsd' >>$file && \
-    echo '   printcap name = /dev/null' >>$file && \
-    echo '   disable spoolss = yes' >>$file && \
-    echo '   strict locking = no' >>$file && \
-    echo '   aio read size = 0' >>$file && \
-    echo '   aio write size = 0' >>$file && \
-    echo '   vfs objects = catia fruit recycle streams_xattr' >>$file && \
-    echo '   recycle:keeptree = yes' >>$file && \
-    echo '   recycle:maxsize = 0' >>$file && \
-    echo '   recycle:repository = .deleted' >>$file && \
-    echo '   recycle:versions = yes' >>$file && \
-    echo '' >>$file && \
-    echo '   # Security' >>$file && \
-    echo '   client ipc max protocol = SMB3' >>$file && \
-    echo '   client ipc min protocol = SMB2_10' >>$file && \
-    echo '   client max protocol = SMB3' >>$file && \
-    echo '   client min protocol = SMB2_10' >>$file && \
-    echo '   server max protocol = SMB3' >>$file && \
-    echo '   server min protocol = SMB2_10' >>$file && \
-    echo '' >>$file && \
-    echo '   # Time Machine' >>$file && \
-    echo '   fruit:delete_empty_adfiles = yes' >>$file && \
-    echo '   fruit:time machine = yes' >>$file && \
-    echo '   fruit:veto_appledouble = no' >>$file && \
-    echo '   fruit:wipe_intentionally_left_blank_rfork = yes' >>$file && \
-    echo '' >>$file && \
-    rm -rf /tmp/*
-
-COPY samba.sh /usr/bin/
-
-EXPOSE 137/udp 138/udp 139 445
-
-HEALTHCHECK --interval=60s --timeout=15s \
-            CMD smbclient -L \\localhost -U % -m SMB3
-
-VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
-            "/run/samba"]
-
-ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/samba.sh"]
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -1,69 +0,0 @@
-FROM arm32v6/alpine
-COPY qemu-arm-static /usr/bin/
-MAINTAINER David Personette <dperson@gmail.com>
-
-# Install samba
-RUN apk --no-cache --no-progress upgrade && \
-    apk --no-cache --no-progress add bash samba shadow tini tzdata && \
-    addgroup -S smb && \
-    adduser -S -D -H -h /tmp -s /sbin/nologin -G smb -g 'Samba User' smbuser &&\
-    file="/etc/samba/smb.conf" && \
-    sed -i 's|^;* *\(log file = \).*|   \1/dev/stdout|' $file && \
-    sed -i 's|^;* *\(load printers = \).*|   \1no|' $file && \
-    sed -i 's|^;* *\(printcap name = \).*|   \1/dev/null|' $file && \
-    sed -i 's|^;* *\(printing = \).*|   \1bsd|' $file && \
-    sed -i 's|^;* *\(unix password sync = \).*|   \1no|' $file && \
-    sed -i 's|^;* *\(preserve case = \).*|   \1yes|' $file && \
-    sed -i 's|^;* *\(short preserve case = \).*|   \1yes|' $file && \
-    sed -i 's|^;* *\(default case = \).*|   \1lower|' $file && \
-    sed -i '/Share Definitions/,$d' $file && \
-    echo '   pam password change = yes' >>$file && \
-    echo '   map to guest = bad user' >>$file && \
-    echo '   usershare allow guests = yes' >>$file && \
-    echo '   create mask = 0664' >>$file && \
-    echo '   force create mode = 0664' >>$file && \
-    echo '   directory mask = 0775' >>$file && \
-    echo '   force directory mode = 0775' >>$file && \
-    echo '   force user = smbuser' >>$file && \
-    echo '   force group = smb' >>$file && \
-    echo '   follow symlinks = yes' >>$file && \
-    echo '   load printers = no' >>$file && \
-    echo '   printing = bsd' >>$file && \
-    echo '   printcap name = /dev/null' >>$file && \
-    echo '   disable spoolss = yes' >>$file && \
-    echo '   strict locking = no' >>$file && \
-    echo '   aio read size = 0' >>$file && \
-    echo '   aio write size = 0' >>$file && \
-    echo '   vfs objects = catia fruit recycle streams_xattr' >>$file && \
-    echo '   recycle:keeptree = yes' >>$file && \
-    echo '   recycle:maxsize = 0' >>$file && \
-    echo '   recycle:repository = .deleted' >>$file && \
-    echo '   recycle:versions = yes' >>$file && \
-    echo '' >>$file && \
-    echo '   # Security' >>$file && \
-    echo '   client ipc max protocol = SMB3' >>$file && \
-    echo '   client ipc min protocol = SMB2_10' >>$file && \
-    echo '   client max protocol = SMB3' >>$file && \
-    echo '   client min protocol = SMB2_10' >>$file && \
-    echo '   server max protocol = SMB3' >>$file && \
-    echo '   server min protocol = SMB2_10' >>$file && \
-    echo '' >>$file && \
-    echo '   # Time Machine' >>$file && \
-    echo '   fruit:delete_empty_adfiles = yes' >>$file && \
-    echo '   fruit:time machine = yes' >>$file && \
-    echo '   fruit:veto_appledouble = no' >>$file && \
-    echo '   fruit:wipe_intentionally_left_blank_rfork = yes' >>$file && \
-    echo '' >>$file && \
-    rm -rf /tmp/*
-
-COPY samba.sh /usr/bin/
-
-EXPOSE 137/udp 138/udp 139 445
-
-HEALTHCHECK --interval=60s --timeout=15s \
-            CMD smbclient -L \\localhost -U % -m SMB3
-
-VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
-            "/run/samba"]
-
-ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/samba.sh"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -2,7 +2,7 @@ version: '3.4'

 services:
  samba:
-    image: dperson/samba
+    image: upagge/samba
    environment:
      TZ: 'EST5EDT'
    networks:
--- a/hooks/post_checkout
+++ b/hooks/post_checkout
@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-API="https://api.github.com/repos/estesp/manifest-tool/tags"
-URL="https://github.com/estesp/manifest-tool/releases/download"
-TAG=$(curl -Ls $API | awk -F'"' '/name.*v[0-9]/ {print $4; exit}')
-curl -LSso manifest-tool "${URL}/${TAG}/manifest-tool-linux-amd64"
-chmod +x manifest-tool
-
-[[ "${DOCKER_TAG}" == "amd64" ]] && \
-    { echo 'qemu-user-static: Download not required for this arch'; exit 0; }
-
-API="https://api.github.com/repos/multiarch/qemu-user-static/tags"
-URL="https://github.com/multiarch/qemu-user-static/releases/download"
-TAG=$(curl -Ls $API | awk -F'"' '/name.*v[0-9]/ {print $4; exit}')
-ARCH=$([[ "${DOCKER_TAG}" == "armhf" ]] && \
-            echo "${DOCKER_TAG::-2}" || echo "${DOCKER_TAG}")
-
-curl -LSs "${URL}/${TAG}/x86_64_qemu-${ARCH}-static.tar.gz" | tar xzv
--- a/hooks/post_push
+++ b/hooks/post_push
@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Use manifest-tool to create the manifest, given the experimental
-# "docker manifest" command isn't available yet on Docker Hub.
-
-./manifest-tool push from-spec multi-arch-manifest.yaml --ignore-missing
--- a/hooks/pre_build
+++ b/hooks/pre_build
@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-[[ "${DOCKER_TAG}" == "amd64" ]] && \
-    { echo 'qemu-user-static: Registration not required for this arch';exit 0; }
-
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
--- a/multi-arch-manifest.yaml
+++ b/multi-arch-manifest.yaml
@ -1,16 +0,0 @@
-image: dperson/samba:latest
-manifests:
-  - image: dperson/samba:amd64
-    platform:
-      architecture: amd64
-      os: linux
-  - image: dperson/samba:aarch64
-    platform:
-      architecture: arm64
-      os: linux
-      variant: v8
-  - image: dperson/samba:armhf
-    platform:
-      architecture: arm
-      os: linux
-      variant: v6
--- a/samba.sh
+++ b/samba.sh
@ -10,7 +10,7 @@
 #  REQUIREMENTS: ---
 #          BUGS: ---
 #         NOTES: ---
-#        AUTHOR: David Personette (dperson@gmail.com),
+#        AUTHOR: Struchkov Mark (mark@struchkov.dev),
 #  ORGANIZATION:
 #       CREATED: 09/28/2014 12:11
 #      REVISION: 1.0