Skip to content

Commit

Permalink
feat: initial update after fork
Browse files Browse the repository at this point in the history
  • Loading branch information
morremeyer committed Jan 8, 2023
1 parent d407fa1 commit e468f89
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 239 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/publish-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Publish OCI image

on:
push:
branches:
- main

jobs:
push_to_registry:
name: Push image to GitHub registry
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3.3.0

- name: Log in to the Container registry
uses: docker/login-action@v2.1.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push Docker image
uses: docker/build-push-action@v3.2.0
with:
context: .
push: true
tags: "ghcr.io/${{ github.repository }}:latest"
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine
MAINTAINER David Personette <dperson@gmail.com>
FROM alpine:3.17.0
LABEL MAINTAINER="Morre <morre@mor.re>"

# Install samba
RUN apk --no-cache --no-progress upgrade && \
Expand Down Expand Up @@ -65,4 +65,4 @@ HEALTHCHECK --interval=60s --timeout=15s \
VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
"/run/samba"]

ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/samba.sh"]
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/samba.sh"]
69 changes: 0 additions & 69 deletions Dockerfile.aarch64

This file was deleted.

69 changes: 0 additions & 69 deletions Dockerfile.armhf

This file was deleted.

22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[![logo](https://raw.githubusercontent.com/dperson/samba/master/logo.jpg)](https://www.samba.org)

# Samba

Samba docker container
Samba docker container.

:warning: This is a fork of [dperson/samba](https://github.com/dperson/samba) maintained by @morremeyer. It has reduced functionality for exactly the use cases I need. You're welcome to add more functionality.

# What is Samba?

Expand All @@ -16,17 +16,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 ghcr.io/morremeyer/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 ghcr.io/morremeyer/samba -p

## Configuration

sudo docker run -it --rm dperson/samba -h
sudo docker run -it --rm ghcr.io/morremeyer/samba -h
Usage: samba.sh [-opt] [command]
Options (fields in '[]' are optional, '<>' are required):
-h This help
Expand Down Expand Up @@ -109,11 +109,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 ghcr.io/morremeyer/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 ghcr.io/morremeyer/samba -p \
-u "example1;badpass" \
-u "example2;badpass" \
-s "public;/share" \
Expand All @@ -134,7 +134,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 ghcr.io/morremeyer/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
Expand All @@ -148,7 +148,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 ghcr.io/morremeyer/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
Expand All @@ -159,4 +159,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).
through a [GitHub issue](https://github.com/morremeyer/samba/issues).
14 changes: 0 additions & 14 deletions _etc_avahi_services_samba.service

This file was deleted.

27 changes: 0 additions & 27 deletions docker-compose.yml

This file was deleted.

18 changes: 0 additions & 18 deletions hooks/post_checkout

This file was deleted.

6 changes: 0 additions & 6 deletions hooks/post_push

This file was deleted.

6 changes: 0 additions & 6 deletions hooks/pre_build

This file was deleted.

Binary file removed logo.jpg
Binary file not shown.
16 changes: 0 additions & 16 deletions multi-arch-manifest.yaml

This file was deleted.

17 changes: 17 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base"],
"platformAutomerge": true,
"pre-commit": {
"enabled": true
},
"reviewers": ["morremeyer"],
"packageRules": [
{
"description": "Automatically upgrade some dependencies",
"matchUpdateTypes": ["minor", "patch"],
"matchManagers": ["github-actions"],
"automerge": true
}
]
}

0 comments on commit e468f89

Please sign in to comment.