diff --git a/Makefile b/Makefile index c6dd417..81da0f7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ PACKER_VERSION ?= 1.5.1 ANSIBLE_VERSION ?= 2.9.2 -ANNOUNCE ?= http://10.2.2.1:6969/announce WEBSEED ?= http://10.2.2.1 CI_COMMIT_REF_SLUG ?= $(shell git name-rev --name-only HEAD) @@ -68,7 +67,6 @@ images/debian-buster.squashfs: images -v "${PWD}:${PWD}" \ -w "${PWD}" \ -e "IMAGES=${PWD}/images" \ - -e "ANNOUNCE=$(ANNOUNCE)" \ -e "WEBSEED=$(WEBSEED)" \ -e "COMPRESSION_LEVEL=$(COMPRESSION_LEVEL)" \ $(ci_environment) \ @@ -81,7 +79,6 @@ images/debian-buster.torrent: images --rm \ -v "${PWD}:${PWD}" \ -w "${PWD}" \ - -e "ANNOUNCE=$(ANNOUNCE)" \ -e "WEBSEED=$(WEBSEED)" \ "$(DOCKER_IMAGE_BUILDER)" \ scripts/torrent.sh \ @@ -93,7 +90,6 @@ ansible: --rm \ -v "${PWD}/packer/ansible:/ansible" \ -u `id -u`:`id -g` \ - -e "ANNOUNCE=$(ANNOUNCE)" \ -e "WEBSEED=$(WEBSEED)" \ -v "${SSH_AUTH_SOCK}:/var/run/ssh_auth_sock" \ -e "SSH_AUTH_SOCK=/var/run/ssh_auth_sock" \ diff --git a/docker-compose.yml b/docker-compose.yml index 6f3da15..d404b02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,9 +7,3 @@ services: - 10.2.2.1:80:80 volumes: - ./images:/usr/share/nginx/html:ro - - opentracker: - build: opentracker - image: opentracker:alpine - ports: - - 10.2.2.1:6969:6969 diff --git a/opentracker/Dockerfile b/opentracker/Dockerfile deleted file mode 100644 index 2b7e56a..0000000 --- a/opentracker/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM alpine - -RUN apk add --no-cache opentracker - -ENTRYPOINT ["/usr/bin/opentracker"]