From 0ffe5ce9baf5956d37438714ee080a05f70973be Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Sun, 5 Mar 2023 13:06:23 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=BC=D0=B8=20=D0=B8=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D1=83?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------ README.md | 21 ++++++++++++--------- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/.drone.yml b/.drone.yml index 88e100b..9d0b35b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,7 @@ --- kind: pipeline type: docker -name: docker-graalvm-native +name: build-and-push-develop steps: @@ -26,13 +26,56 @@ steps: - echo "$DOCKER_REGISTRY_TOKEN" | docker login docker.io --username $DOCKER_REGISTRY_USER --password-stdin - echo "$STRUCHKOV_DOCKER_REGISTRY_TOKEN" | docker login git.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin - docker buildx create --use - - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "$DOCKER_IMAGE_NAME:new" -t "git.struchkov.dev/$STRUCHKOV_DOCKER_IMAGE_NAME:latest" . -# - docker build -t "$DOCKER_IMAGE_NAME:latest" . -# - docker push "$DOCKER_IMAGE_NAME:latest" + - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "$DOCKER_IMAGE_NAME:develop" -t "git.struchkov.dev/$STRUCHKOV_DOCKER_IMAGE_NAME:develop" . trigger: branch: - - master + - develop + +services: + - name: docker + image: docker:20.10.22-dind-alpine3.17 + privileged: true + volumes: + - name: dockersock + path: /var/run + +volumes: + - name: dockersock + temp: {} +--- +kind: pipeline +type: docker +name: build-and-push-release + +steps: + + - name: docker build an publish + image: upagge/docker-buildx:latest + environment: + DOCKER_REGISTRY_TOKEN: + from_secret: DOCKER_REGISTRY_TOKEN + DOCKER_IMAGE_NAME: + from_secret: DOCKER_IMAGE_NAME + DOCKER_REGISTRY_USER: + from_secret: DOCKER_REGISTRY_USER + STRUCHKOV_DOCKER_IMAGE_NAME: + from_secret: STRUCHKOV_DOCKER_IMAGE_NAME + STRUCHKOV_DOCKER_REGISTRY_TOKEN: + from_secret: STRUCHKOV_DOCKER_REGISTRY_TOKEN + volumes: + - name: dockersock + path: /var/run + commands: + - sleep 15 + - echo "$DOCKER_REGISTRY_TOKEN" | docker login docker.io --username $DOCKER_REGISTRY_USER --password-stdin + - echo "$STRUCHKOV_DOCKER_REGISTRY_TOKEN" | docker login git.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin + - docker buildx create --use + - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "$DOCKER_IMAGE_NAME:latest" -t "$DOCKER_IMAGE_NAME:$DRONE_TAG" -t "git.struchkov.dev/$STRUCHKOV_DOCKER_IMAGE_NAME:latest" -t "git.struchkov.dev/$STRUCHKOV_DOCKER_IMAGE_NAME:$DRONE_TAG" . + +trigger: + ref: + - refs/tags/* services: - name: docker @@ -47,6 +90,6 @@ volumes: temp: {} --- kind: signature -hmac: 8ca861365f61439945fec65cdf54ce885efa286b10e323aabac3ad13b629f3b0 +hmac: 8cbec230fea28e3ebdaefe0d8d13e9bef855e7cc7207df01f7f7d8b3e80c803d ... diff --git a/README.md b/README.md index 8a65c0c..db36899 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,12 @@ -[![logo](https://raw.githubusercontent.com/dperson/samba/master/logo.jpg)](https://www.samba.org) +[![logo](https://raw.githubusercontent.com/upagge/samba/master/logo.jpg)](https://www.samba.org) # Samba Samba docker container +# Fork +This repository is a fork of the https://github.com/dperson/samba project, since dperson/samba stopped being updated a long time ago. This version contains the current samba for the current version of alpine. + # What is Samba? Since 1992, Samba has provided secure, stable and fast file and print services @@ -16,17 +19,17 @@ By default there are no shares configured, additional ones can be added. ## Hosting a Samba instance - sudo docker run -it -p 139:139 -p 445:445 -d dperson/samba -p + sudo docker run -it -p 139:139 -p 445:445 -d upagge/samba -p OR set local storage: sudo docker run -it --name samba -p 139:139 -p 445:445 \ -v /path/to/directory:/mount \ - -d dperson/samba -p + -d upagge/samba -p ## Configuration - sudo docker run -it --rm dperson/samba -h + sudo docker run -it --rm upagge/samba -h Usage: samba.sh [-opt] [command] Options (fields in '[]' are optional, '<>' are required): -h This help @@ -109,11 +112,11 @@ Any of the commands can be run at creation with `docker run` or later with ### Setting the Timezone - sudo docker run -it -e TZ=EST5EDT -p 139:139 -p 445:445 -d dperson/samba -p + sudo docker run -it -e TZ=EST5EDT -p 139:139 -p 445:445 -d upagge/samba -p ### Start an instance creating users and shares: - sudo docker run -it -p 139:139 -p 445:445 -d dperson/samba -p \ + sudo docker run -it -p 139:139 -p 445:445 -d upagge/samba -p \ -u "example1;badpass" \ -u "example2;badpass" \ -s "public;/share" \ @@ -134,7 +137,7 @@ Add the `-p` option to the end of your options to the container, or set the sudo docker run -it --name samba -p 139:139 -p 445:445 \ -v /path/to/directory:/mount \ - -d dperson/samba -p + -d upagge/samba -p If changing the permissions of your files is not possible in your setup you can instead set the environment variables `USERID` and `GROUPID` to the @@ -148,7 +151,7 @@ docker_compose.yml files, IE: sudo docker run -it --name samba -m 512m -p 139:139 -p 445:445 \ -v /path/to/directory:/mount \ - -d dperson/samba -p + -d upagge/samba -p * Attempting to connect with the `smbclient` commandline tool. By default samba still tries to use SMB1, which is depriciated and has security issues. This @@ -159,4 +162,4 @@ any other options you would specify. ## Issues If you have any problems with or questions about this image, please contact me -through a [GitHub issue](https://github.com/dperson/samba/issues). \ No newline at end of file +through a [GitHub issue](https://github.com/upagge/samba/issues). \ No newline at end of file