Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399791 )
Change subject: Convert ci-src-setup-simple to docker-pkg
......................................................................
Convert ci-src-setup-simple to docker-pkg
Bug: T177276
Change-Id: I3bbe05da26417d2bd1206481ac56ac3f85f48821
---
D dockerfiles/ci-src-setup-simple/Dockerfile
A dockerfiles/ci-src-setup-simple/Dockerfile.template
A dockerfiles/ci-src-setup-simple/changelog
A dockerfiles/ci-src-setup-simple/control
M jjb/macro-docker.yaml
5 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/91/399791/1
diff --git a/dockerfiles/ci-src-setup-simple/Dockerfile
b/dockerfiles/ci-src-setup-simple/Dockerfile
deleted file mode 100644
index 9d27801..0000000
--- a/dockerfiles/ci-src-setup-simple/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM docker-registry.wikimedia.org/releng/ci-stretch
-
-USER nobody
-COPY run.sh /run.sh
-ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/ci-src-setup-simple/Dockerfile.template
b/dockerfiles/ci-src-setup-simple/Dockerfile.template
new file mode 100644
index 0000000..7a4e20a
--- /dev/null
+++ b/dockerfiles/ci-src-setup-simple/Dockerfile.template
@@ -0,0 +1,5 @@
+FROM {{ "ci-stretch" | image_tag }}
+
+USER nobody
+COPY run.sh /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/ci-src-setup-simple/changelog
b/dockerfiles/ci-src-setup-simple/changelog
new file mode 100644
index 0000000..fe3776e
--- /dev/null
+++ b/dockerfiles/ci-src-setup-simple/changelog
@@ -0,0 +1,5 @@
+ci-src-setup-simple (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg
+
+ -- Antoine Musso <[email protected]> Fri, 22 Dec 2017 10:30:31 +0100
diff --git a/dockerfiles/ci-src-setup-simple/control
b/dockerfiles/ci-src-setup-simple/control
new file mode 100644
index 0000000..6ffa818
--- /dev/null
+++ b/dockerfiles/ci-src-setup-simple/control
@@ -0,0 +1 @@
+Depends: ci-stretch
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index bd1ee3a..423193a 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -120,5 +120,5 @@
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
- wmfreleng/ci-src-setup-simple:v2017.12.18.14.07
+ docker-registry.wikimedia.org/releng/ci-src-setup-simple:0.1.0
# nothing else can be executed due to exec
--
To view, visit https://gerrit.wikimedia.org/r/399791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bbe05da26417d2bd1206481ac56ac3f85f48821
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
