From 53ecbdaaddad10b78627f3d6c30b669d8efc3e57 Mon Sep 17 00:00:00 2001 From: Aki Sasaki Date: Thu, 30 Apr 2020 11:13:39 -0700 Subject: [PATCH 1/2] address review comments --- taskcluster/docker/REGISTRY | 2 +- taskcluster/docker/base/Dockerfile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/taskcluster/docker/REGISTRY b/taskcluster/docker/REGISTRY index 46d93b4..6da4cbd 100644 --- a/taskcluster/docker/REGISTRY +++ b/taskcluster/docker/REGISTRY @@ -1 +1 @@ -mozilla-mobile +mozilla-extensions diff --git a/taskcluster/docker/base/Dockerfile b/taskcluster/docker/base/Dockerfile index c2dbcfa..0cb19bf 100644 --- a/taskcluster/docker/base/Dockerfile +++ b/taskcluster/docker/base/Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu:18.04 -MAINTAINER Tom Prince "mozilla@hocat.ca" - # Add worker user RUN mkdir /builds && \ useradd -d /builds/worker -s /bin/bash -m worker && \ From 11c182846f88d4424fd391264468b3637adece6e Mon Sep 17 00:00:00 2001 From: Aki Sasaki Date: Thu, 30 Apr 2020 11:18:23 -0700 Subject: [PATCH 2/2] remove unused dockerfile --- taskcluster/docker/base/Dockerfile | 62 ------------------------------ 1 file changed, 62 deletions(-) delete mode 100644 taskcluster/docker/base/Dockerfile diff --git a/taskcluster/docker/base/Dockerfile b/taskcluster/docker/base/Dockerfile deleted file mode 100644 index 0cb19bf..0000000 --- a/taskcluster/docker/base/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -FROM ubuntu:18.04 - -# Add worker user -RUN mkdir /builds && \ - useradd -d /builds/worker -s /bin/bash -m worker && \ - chown worker:worker /builds/worker && \ - mkdir /builds/worker/artifacts && \ - chown worker:worker /builds/worker/artifacts - -WORKDIR /builds/worker/ - -#---------------------------------------------------------------------------------------------------------------------- -#-- Configuration ----------------------------------------------------------------------------------------------------- -#---------------------------------------------------------------------------------------------------------------------- - -ENV LANG en_US.UTF-8 - -# Do not use fancy output on taskcluster -ENV TERM dumb - -#---------------------------------------------------------------------------------------------------------------------- -#-- System ------------------------------------------------------------------------------------------------------------ -#---------------------------------------------------------------------------------------------------------------------- - -RUN apt-get update -qq \ - # We need to install tzdata before all of the other packages. Otherwise it will show an interactive dialog that - # we cannot navigate while building the Docker image. - && apt-get install -y tzdata \ - && apt-get install -y openjdk-8-jdk \ - wget \ - expect \ - git \ - curl \ - python \ - python-pip \ - python3 \ - locales \ - unzip \ - mercurial \ - && apt-get clean - -RUN pip install --upgrade pip -RUN pip install 'taskcluster>=4,<5' - -RUN locale-gen en_US.UTF-8 - -# %include-run-task - -ENV SHELL=/bin/bash \ - HOME=/builds/worker \ - PATH=/builds/worker/.local/bin:$PATH - - -VOLUME /builds/worker/checkouts -VOLUME /builds/worker/.cache - -# run-task expects to run as root -USER root