From 4663032035039cc642db9b3f82b289418d02c430 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Mon, 7 Aug 2017 13:35:47 -0400
Subject: Bug 1383355 - Migrate CI tests from taskcluster to CircleCI

---
 Dockerfile | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index f0477b655..d6057775e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,33 +1,23 @@
-FROM mozillabteam/bmo-base:slim
+FROM mozillabteam/bmo-slim:latest
 MAINTAINER Dylan William Hardison <dylan@mozilla.com>
 
-RUN wget -q https://s3.amazonaws.com/moz-devservices-bmocartons/bmo/vendor.tar.gz && \
-    tar -C /opt -zxf /vendor.tar.gz bmo/local/ bmo/LIBS.txt bmo/cpanfile bmo/cpanfile.snapshot && \
-    rm /vendor.tar.gz && \
-    mkdir /opt/bmo/httpd && \
-    ln -s /usr/lib64/httpd/modules /opt/bmo/httpd/modules && \
-    mkdir /opt/bmo/httpd/conf && \
-    cp {/etc/httpd/conf,/opt/bmo/httpd}/magic && \
-    awk '{print $1}' > LIBS.txt \
-        | perl -nE 'chomp; unless (-f $_) { $missing++; say $_ } END { exit 1 if $missing }' && \
-    useradd -u 10001 -U app -m
+ENV BUNDLE=https://s3.amazonaws.com/moz-devservices-bmocartons/bmo/vendor.tar.gz
+ENV PORT=8000
 
-COPY . /app
 WORKDIR /app
-RUN ln -sv /opt/bmo/local /app/local && \
+COPY . .
+
+RUN mv /opt/bmo/local /app && \
     chown -R app:app /app && \
-    cp /app/docker_files/httpd.conf /opt/bmo/httpd/ && \
-    mkdir /opt/bmo/bin && \
-    cp /app/docker_files/init.pl /opt/bmo/bin/init.pl
+    perl -c /app/scripts/entrypoint.pl
 
 USER app
-RUN perl checksetup.pl --no-database --default-localconfig && \
-    prove t && \
-    rm -rf /app/data && mkdir /app/data
 
-ENV PORT=8000
+RUN perl checksetup.pl --no-database --default-localconfig && \
+    rm -rf /app/data /app/localconfig && \
+    mkdir /app/data
 
 EXPOSE $PORT
 
-ENTRYPOINT ["/opt/bmo/bin/init.pl"]
+ENTRYPOINT ["/app/scripts/entrypoint.pl"]
 CMD ["httpd"]
-- 
cgit v1.2.3-24-g4f1b