From 91a3f538b4ff688425b804ccad28f6f49264fa79 Mon Sep 17 00:00:00 2001
From: Jim Crist-Harif <jcristharif@gmail.com>
Date: Mon, 1 Mar 2021 10:08:11 -0600
Subject: [PATCH 1/3] Install tini from apt in apollo image

Now that we're using a more recent debian version, we can install `tini`
from apt instead of github.
---
 services/apollo/Dockerfile | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/services/apollo/Dockerfile b/services/apollo/Dockerfile
index 6068734a..946a702e 100644
--- a/services/apollo/Dockerfile
+++ b/services/apollo/Dockerfile
@@ -25,19 +25,10 @@ LABEL org.label-schema.version=${PREFECT_VERSION}
 LABEL org.label-schema.build-date=${RELEASE_TIMESTAMP}
 
 RUN apt-get update \
- && apt-get install curl --no-install-recommends -y \
+ && apt-get install curl tini --no-install-recommends -y \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
-# Install tini with checksum verification
-# Once we upgrade to a newer version of Debian (Buster+), we can just `apt-get install tini`
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH} /tini-${ARCH}
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH}.sha256sum /tini.sha256sum
-RUN echo "$(cat tini.sha256sum)" | sha256sum -c \
- && mv /tini-${ARCH} /tini \
- && chmod +x /tini
-
 WORKDIR /apollo
 COPY . .
 
@@ -45,5 +36,5 @@ RUN npm ci && \
     npm run build && \
     chmod +x post-start.sh
 
-ENTRYPOINT ["/tini", "-g", "--"]
+ENTRYPOINT ["tini", "-g", "--"]
 CMD ["npm", "run", "serve"]

From 9f33256da11123697a1bfbb6c5073e6f504f051a Mon Sep 17 00:00:00 2001
From: Jim Crist-Harif <jcristharif@gmail.com>
Date: Mon, 1 Mar 2021 10:10:39 -0600
Subject: [PATCH 2/3] Add changelog entry

---
 changes/pr199.yaml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changes/pr199.yaml

diff --git a/changes/pr199.yaml b/changes/pr199.yaml
new file mode 100644
index 00000000..1fd08295
--- /dev/null
+++ b/changes/pr199.yaml
@@ -0,0 +1,2 @@
+enhancement:
+  - "Install `tini` from apt instead of GitHub in apollo image - [#199](https://github.com/PrefectHQ/server/pull/199)"

From 5692ddf511558f1343c8b833dc81136f9fcf39f0 Mon Sep 17 00:00:00 2001
From: Jim Crist-Harif <jcristharif@gmail.com>
Date: Mon, 1 Mar 2021 10:11:16 -0600
Subject: [PATCH 3/3] Add changelog entry

---
 services/apollo/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/services/apollo/Dockerfile b/services/apollo/Dockerfile
index 946a702e..47071926 100644
--- a/services/apollo/Dockerfile
+++ b/services/apollo/Dockerfile
@@ -12,10 +12,6 @@ ENV PREFECT_SERVER_VERSION=${PREFECT_SERVER_VERSION:-master}
 ARG RELEASE_TIMESTAMP
 ENV RELEASE_TIMESTAMP=$RELEASE_TIMESTAMP
 
-# Architecture to support. Necessary for a working tini entrypoint on non-x86/64 builds
-ARG ARCH
-ENV ARCH=${ARCH:-amd64}
-
 # Image Labels
 LABEL maintainer="help@prefect.io"
 LABEL org.label-schema.schema-version = "1.0"