Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30701fd139 | ||
|
|
19008464f4 | ||
|
|
dcb7216288 |
@@ -1,7 +1,8 @@
|
|||||||
FROM debian:stretch
|
FROM debian:buster
|
||||||
|
|
||||||
ARG FTP_UID=48
|
ARG FTP_UID=48
|
||||||
ARG FTP_GID=48
|
ARG FTP_GID=48
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& groupadd -g ${FTP_GID} ftp \
|
&& groupadd -g ${FTP_GID} ftp \
|
||||||
&& useradd --no-create-home --home-dir /srv -s /bin/false --uid ${FTP_UID} --gid ${FTP_GID} -c 'ftp daemon' ftp \
|
&& useradd --no-create-home --home-dir /srv -s /bin/false --uid ${FTP_UID} --gid ${FTP_GID} -c 'ftp daemon' ftp \
|
||||||
|
|||||||
3
LICENSE
3
LICENSE
@@ -1,6 +1,6 @@
|
|||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2015 Volt Grid Pty Ltd
|
Copyright (c) 2015-2019 Volt Grid Pty Ltd
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
THE SOFTWARE.
|
THE SOFTWARE.
|
||||||
|
|
||||||
|
|||||||
8
Makefile
8
Makefile
@@ -7,7 +7,7 @@ help:
|
|||||||
@printf "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)\n"
|
@printf "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)\n"
|
||||||
|
|
||||||
build: ## Build for publishing
|
build: ## Build for publishing
|
||||||
docker build --pull -t $(IMAGE_NAME):latest .
|
docker build --pull -t $(IMAGE_NAME):$(TAG) .
|
||||||
|
|
||||||
build-local: ## Builds with local users UID and GID
|
build-local: ## Builds with local users UID and GID
|
||||||
docker build --build-arg FTP_UID=$(shell id -u) --build-arg FTP_GID=$(shell id -g) -t $(IMAGE_NAME):$(TAG) .
|
docker build --build-arg FTP_UID=$(shell id -u) --build-arg FTP_GID=$(shell id -g) -t $(IMAGE_NAME):$(TAG) .
|
||||||
@@ -37,13 +37,7 @@ run-ssl: env vsftpd.pem
|
|||||||
@docker kill ${ID}
|
@docker kill ${ID}
|
||||||
|
|
||||||
push: ## Pushes the docker image to hub.docker.com
|
push: ## Pushes the docker image to hub.docker.com
|
||||||
# Don't --pull here, we don't want any last minute upsteam changes
|
|
||||||
docker build -t $(IMAGE_NAME):$(TAG) .
|
|
||||||
docker tag $(IMAGE_NAME):$(TAG) $(IMAGE_NAME):latest
|
|
||||||
docker push $(IMAGE_NAME):$(TAG)
|
docker push $(IMAGE_NAME):$(TAG)
|
||||||
docker push $(IMAGE_NAME):latest
|
|
||||||
|
|
||||||
clean: ## Remove built images
|
clean: ## Remove built images
|
||||||
docker rmi $(IMAGE_NAME):latest
|
|
||||||
docker rmi $(IMAGE_NAME):$(TAG)
|
docker rmi $(IMAGE_NAME):$(TAG)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user