aptly: Fix some permissions issues
Additionally, add a Makefile so we can build and push easily.
Change-Id: Ib06522ef4e5ea67aa8cd900fb830c7828a759a53
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e91a8c3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.push
+.build
+
diff --git a/aptly-docker/Dockerfile b/aptly-docker/Dockerfile
index ee1f85c..16b8d74 100644
--- a/aptly-docker/Dockerfile
+++ b/aptly-docker/Dockerfile
@@ -6,12 +6,12 @@
apt-get install -y debian-archive-keyring gnupg aptly aptly-api aptly-publisher && \
apt-get clean'
-ADD start-aptly-api.sh /
-ADD aptly-api.conf /etc/aptly-api.conf
+ADD --chown=aptly-api:aptly-api start-aptly-api.sh /start-aptly-api.sh
+ADD --chown=aptly-api:aptly-api aptly-api.conf /etc/aptly-api.conf
VOLUME ['/var/lib/aptly-api', '/srv/aptly-publish-fs']
WORKDIR /var/lib/aptly-api
-USER aptly-api:aptly-api
EXPOSE 8080
-ENTRYPOINT ["/bin/bash", "-c", "/start-aptly-api.sh"]
+ENV GIN_MODE=release
+ENTRYPOINT ["bash", "-c", "/start-aptly-api.sh"]
diff --git a/aptly-docker/Makefile b/aptly-docker/Makefile
new file mode 100644
index 0000000..c223f9f
--- /dev/null
+++ b/aptly-docker/Makefile
@@ -0,0 +1,12 @@
+build: .build
+
+.build: Dockerfile Makefile aptly-api.conf start-aptly-api.sh
+ docker build -t gcr.io/mendel-linux-cloud-infra/aptly-api:latest .
+ touch .build
+
+push: .push
+.push: .build
+ docker push gcr.io/mendel-linux-cloud-infra/aptly-api:latest
+ touch .push
+
+.PHONY: build push
diff --git a/aptly-docker/start-aptly-api.sh b/aptly-docker/start-aptly-api.sh
index 44b3c58..80bf24e 100755
--- a/aptly-docker/start-aptly-api.sh
+++ b/aptly-docker/start-aptly-api.sh
@@ -5,6 +5,9 @@
export LISTEN_ADDRESS='0.0.0.0:8080'
export GIN_MODE='release'
-exec /usr/bin/aptly api serve \
- -config=/etc/aptly-api.conf \
- -listen="${LISTEN_ADDRESS}"
+mkdir -p /srv/aptly-publish-fs
+chown -R aptly-api:aptly-api /var/lib/aptly-api /srv/aptly-publish-fs
+
+exec su - aptly-api /usr/bin/aptly api serve \
+ -config=/etc/aptly-api.conf \
+ -listen="${LISTEN_ADDRESS}"
