add MCROUTER_LISTEN_PORT as Dockerfile ENV

explicitly list and COPY files into the docker image fs
facebook · Feb 27, 2019 · 8152ee7 · 8152ee7
1 parent 40dd7b4
commit 8152ee7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/mcrouter/scripts/docker/Dockerfile.ubuntu-packaged b/mcrouter/scripts/docker/Dockerfile.ubuntu-packaged
@@ -8,7 +8,20 @@ RUN set -xe \
            apt-get update \
         && apt-get install -y $buildDeps 
 
-COPY ["container/ubuntu-packaged/", "/"]
+
+COPY ["container/ubuntu-packaged/entrypoint.sh", \
+      "/usr/local/bin/"  \
+     ]
+
+COPY ["container/ubuntu-packaged/10-mcrouter.list", \
+      "/etc/apt/sources.list.d/"  \
+     ]
+
+COPY ["container/ubuntu-packaged/mcrouter.json", \
+      "/etc/mcrouter/"  \
+     ]
+
+
 
 RUN wget -qO- \
         https://facebook.github.io/mcrouter/debrepo/xenial/PUBLIC.KEY \
@@ -20,4 +33,7 @@ RUN wget -qO- \
         && apt-get purge -y --autoremove -o APT::AutoRemove::RecommendsImportant=false wget apt-transport-https \
         && apt-get autoremove && apt-get autoclean && rm -rf /var/lib/apt-lists/*
 
+
+ENV MCROUTER_LISTEN_PORT 5000
+
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/...d/etc/apt/sources.list.d/10-mcrouter.list → ...ontainer/ubuntu-packaged/10-mcrouter.list b/...d/etc/apt/sources.list.d/10-mcrouter.list → ...ontainer/ubuntu-packaged/10-mcrouter.list
diff --git a/...untu-packaged/usr/local/bin/entrypoint.sh → ...r/container/ubuntu-packaged/entrypoint.sh b/...untu-packaged/usr/local/bin/entrypoint.sh → ...r/container/ubuntu-packaged/entrypoint.sh
@@ -6,7 +6,8 @@ function run_mcrouter() {
         local CONFIG_PATH=$1
         mcrouter \
         --config file:${CONFIG_PATH} \
-        -p "${MCROUTER_LISTEN_PORT:-5000}"
+        -p "${MCROUTER_LISTEN_PORT:-5000}" \
+	"$@"
 }