Last active
January 10, 2019 19:40
-
-
Save Osmose/19b573c780522be1be85fcffe0683f37 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/docker/Dockerfile b/docker/Dockerfile | |
index 3353e8c6f..84d802a1c 100644 | |
--- a/docker/Dockerfile | |
+++ b/docker/Dockerfile | |
@@ -50,9 +50,12 @@ COPY . /app/ | |
# static files | |
RUN cd /app/webapp-django/ && python manage.py collectstatic --noinput | |
+# app should own everything under /app in the container | |
+RUN chown -R app.app /app | |
+ | |
USER app | |
-# Build tmp directories for minidump stackwalker--owned by app | |
+# Build tmp directories for minidump stackwalker | |
RUN mkdir -p /tmp/symbols/cache | |
RUN mkdir -p /tmp/symbols/tmp | |
diff --git a/scripts/build-stackwalker.sh b/scripts/build-stackwalker.sh | |
index efb7911b5..c39a7a407 100755 | |
--- a/scripts/build-stackwalker.sh | |
+++ b/scripts/build-stackwalker.sh | |
@@ -17,7 +17,9 @@ SRCDIR="${SRCDIR:-$(pwd)}" | |
cd "${SRCDIR}" | |
-if [ "$(uname -sm)" == "Linux x86_64" ]; then | |
+# FIXME(willkg): breaking this so the image builds | |
+# if [ "$(uname -sm)" == "Linux x86_64" ]; then | |
+if [ "$(uname -sm)" == "Linux x8664" ]; then | |
# Fetch pre-built, known version of breakpad from taskcluster | |
wget -N --quiet 'https://index.taskcluster.net/v1/task/project.socorro.breakpad.v1.builds.linux64.latest/artifacts/public/breakpad.tar.gz' | |
tar -zxf breakpad.tar.gz |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment