Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker-library images #2922

Merged
merged 1 commit into from
May 3, 2017

Conversation

tianon
Copy link
Member

@tianon tianon commented May 3, 2017

  • docker: 17.05.0-ce-rc3
  • mariadb: 10.1.23, 5.5.56
  • redmine: passenger 5.1.3

- `docker`: 17.05.0-ce-rc3
- `mariadb`: 10.1.23, 5.5.56
- `redmine`: passenger 5.1.3
@tianon
Copy link
Member Author

tianon commented May 3, 2017

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 3bd09f4..c6198b0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -26,9 +26,9 @@ docker:17.05.0
 docker:17.05.0-ce
 docker:17.05.0-ce-dind
 docker:17.05.0-ce-git
-docker:17.05.0-ce-rc2
-docker:17.05.0-ce-rc2-dind
-docker:17.05.0-ce-rc2-git
+docker:17.05.0-ce-rc3
+docker:17.05.0-ce-rc3-dind
+docker:17.05.0-ce-rc3-git
 docker:17.05.0-dind
 docker:17.05.0-git
 docker:dind
@@ -45,12 +45,12 @@ docker:stable-dind
 docker:stable-git
 mariadb:5
 mariadb:5.5
-mariadb:5.5.55
+mariadb:5.5.56
 mariadb:10
 mariadb:10.0
 mariadb:10.0.30
 mariadb:10.1
-mariadb:10.1.22
+mariadb:10.1.23
 mariadb:latest
 redmine:3
 redmine:3-passenger
diff --git a/docker_rc/Dockerfile b/docker_rc/Dockerfile
index 17449d9..bcbb0ae 100644
--- a/docker_rc/Dockerfile
+++ b/docker_rc/Dockerfile
@@ -6,9 +6,9 @@ RUN apk add --no-cache \
 		openssl
 
 ENV DOCKER_BUCKET test.docker.com
-ENV DOCKER_VERSION 17.05.0-ce-rc2
-ENV DOCKER_SHA256_x86_64 fc2521a30797212410f46faece24204b9528990dac823c145b530c05acd50e9d
-ENV DOCKER_SHA256_armel c4427822445e5f8c970ded1c106780a32641a7344c92a8dc57a9be4e0ea9cba0
+ENV DOCKER_VERSION 17.05.0-ce-rc3
+ENV DOCKER_SHA256_x86_64 4cae10fab8860c824ae46d644cab08c088ee0f5b20b759f975ebf5e19ae7a83c
+ENV DOCKER_SHA256_armel 8ac04d9f4a56af501c82d2a3df6dfe750eed351036b281ce78933cdb65373369
 
 RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
diff --git a/mariadb_5/Dockerfile b/mariadb_5/Dockerfile
index 8dc5e2d..a3bb181 100644
--- a/mariadb_5/Dockerfile
+++ b/mariadb_5/Dockerfile
@@ -58,7 +58,7 @@ RUN echo "deb https://repo.percona.com/apt wheezy main" > /etc/apt/sources.list.
 	} > /etc/apt/preferences.d/percona
 
 ENV MARIADB_MAJOR 5.5
-ENV MARIADB_VERSION 5.5.55+maria-1~wheezy
+ENV MARIADB_VERSION 5.5.56+maria-1~wheezy
 
 RUN echo "deb http://ftp.osuosl.org/pub/mariadb/repo/$MARIADB_MAJOR/debian wheezy main" > /etc/apt/sources.list.d/mariadb.list \
 	&& { \
diff --git a/mariadb_latest/Dockerfile b/mariadb_latest/Dockerfile
index 300e791..e864506 100644
--- a/mariadb_latest/Dockerfile
+++ b/mariadb_latest/Dockerfile
@@ -58,7 +58,7 @@ RUN echo "deb https://repo.percona.com/apt jessie main" > /etc/apt/sources.list.
 	} > /etc/apt/preferences.d/percona
 
 ENV MARIADB_MAJOR 10.1
-ENV MARIADB_VERSION 10.1.22+maria-1~jessie
+ENV MARIADB_VERSION 10.1.23+maria-1~jessie
 
 RUN echo "deb http://ftp.osuosl.org/pub/mariadb/repo/$MARIADB_MAJOR/debian jessie main" > /etc/apt/sources.list.d/mariadb.list \
 	&& { \
diff --git a/redmine_3.1-passenger/Dockerfile b/redmine_3.1-passenger/Dockerfile
index 789f8eb..717c7df 100644
--- a/redmine_3.1-passenger/Dockerfile
+++ b/redmine_3.1-passenger/Dockerfile
@@ -1,6 +1,6 @@
 FROM redmine:3.1
 
-ENV PASSENGER_VERSION 5.1.2
+ENV PASSENGER_VERSION 5.1.3
 
 RUN buildDeps=' \
 		make \
diff --git a/redmine_3.2-passenger/Dockerfile b/redmine_3.2-passenger/Dockerfile
index 242a574..e980ece 100644
--- a/redmine_3.2-passenger/Dockerfile
+++ b/redmine_3.2-passenger/Dockerfile
@@ -1,6 +1,6 @@
 FROM redmine:3.2
 
-ENV PASSENGER_VERSION 5.1.2
+ENV PASSENGER_VERSION 5.1.3
 
 RUN buildDeps=' \
 		make \
diff --git a/redmine_passenger/Dockerfile b/redmine_passenger/Dockerfile
index 79c1dac..6744d2d 100644
--- a/redmine_passenger/Dockerfile
+++ b/redmine_passenger/Dockerfile
@@ -1,6 +1,6 @@
 FROM redmine:3.3
 
-ENV PASSENGER_VERSION 5.1.2
+ENV PASSENGER_VERSION 5.1.3
 
 RUN buildDeps=' \
 		make \

@tianon
Copy link
Member Author

tianon commented May 3, 2017

Build test of #2922; 11e169f (docker, mariadb, redmine):

$ bashbrew build docker:17.05.0-ce-rc3
Building bashbrew/cache:e02da5dde1c957fb1c7821bae5e7174861ce07c4046a0da943325ca225bf9494 (docker:17.05.0-ce-rc3)
Tagging docker:17.05.0-ce-rc3
Tagging docker:17.05.0-ce
Tagging docker:17.05.0
Tagging docker:17.05-rc
Tagging docker:rc

$ test/run.sh docker:17.05.0-ce-rc3
testing docker:17.05.0-ce-rc3
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build docker:17.05.0-ce-rc3-dind
Building bashbrew/cache:41feb67b440d82e42b9c3551932821fa512a6605ec9f9007ea4a9772b5ac26f2 (docker:17.05.0-ce-rc3-dind)
Tagging docker:17.05.0-ce-rc3-dind
Tagging docker:17.05.0-ce-dind
Tagging docker:17.05.0-dind
Tagging docker:17.05-rc-dind
Tagging docker:rc-dind

$ test/run.sh docker:17.05.0-ce-rc3-dind
testing docker:17.05.0-ce-rc3-dind
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'docker-dind' [5/6]...passed
	'docker-registry-push-pull' [6/6]...passed


$ bashbrew build docker:17.05.0-ce-rc3-git
Building bashbrew/cache:ed1aaa89659ab9453119473bacfbe5cb1c9d10e50edcd9930965888ead156f0b (docker:17.05.0-ce-rc3-git)
Tagging docker:17.05.0-ce-rc3-git
Tagging docker:17.05.0-ce-git
Tagging docker:17.05.0-git
Tagging docker:17.05-rc-git
Tagging docker:rc-git

$ test/run.sh docker:17.05.0-ce-rc3-git
testing docker:17.05.0-ce-rc3-git
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build docker:17.04.0-ce
Using bashbrew/cache:cd17eb26f8780f032f4d0aed99fa86417e90deaed93fd26d72a826e27c1674cc (docker:17.04.0-ce)
Tagging docker:17.04.0-ce
Tagging docker:17.04.0
Tagging docker:17.04
Tagging docker:17
Tagging docker:latest
Tagging docker:edge

$ test/run.sh docker:17.04.0-ce
testing docker:17.04.0-ce
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build docker:17.04.0-ce-dind
Using bashbrew/cache:785ac7be1b585ad0961f0e45808e3dadb4c7544ef78dc5d6407cc9e20ec51d83 (docker:17.04.0-ce-dind)
Tagging docker:17.04.0-ce-dind
Tagging docker:17.04.0-dind
Tagging docker:17.04-dind
Tagging docker:17-dind
Tagging docker:dind
Tagging docker:edge-dind

$ test/run.sh docker:17.04.0-ce-dind
testing docker:17.04.0-ce-dind
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'docker-dind' [5/6]...passed
	'docker-registry-push-pull' [6/6]...passed


$ bashbrew build docker:17.04.0-ce-git
Using bashbrew/cache:a740a2f2e6ec0e16689a19521a2a6af112b651e40bc953e1977f49d1c9282d3e (docker:17.04.0-ce-git)
Tagging docker:17.04.0-ce-git
Tagging docker:17.04.0-git
Tagging docker:17.04-git
Tagging docker:17-git
Tagging docker:git
Tagging docker:edge-git

$ test/run.sh docker:17.04.0-ce-git
testing docker:17.04.0-ce-git
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build docker:17.03.1-ce
Using bashbrew/cache:06ceeffe8ff35959586e8d51564f7ddf111ad35e58b609e071de7f386d26c86c (docker:17.03.1-ce)
Tagging docker:17.03.1-ce
Tagging docker:17.03.1
Tagging docker:17.03
Tagging docker:stable

$ test/run.sh docker:17.03.1-ce
testing docker:17.03.1-ce
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build docker:17.03.1-ce-dind
Using bashbrew/cache:521cd1dec8c1ba7c8cdbe51916365458db7bd97230e481e14f3436ecd8a80d6b (docker:17.03.1-ce-dind)
Tagging docker:17.03.1-ce-dind
Tagging docker:17.03.1-dind
Tagging docker:17.03-dind
Tagging docker:stable-dind

$ test/run.sh docker:17.03.1-ce-dind
testing docker:17.03.1-ce-dind
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'docker-dind' [5/6]...passed
	'docker-registry-push-pull' [6/6]...passed


$ bashbrew build docker:17.03.1-ce-git
Using bashbrew/cache:b8bb535e0051cc511ca44de02518c507dceb39ba50c06c1f55cc7f367e8d5ad5 (docker:17.03.1-ce-git)
Tagging docker:17.03.1-ce-git
Tagging docker:17.03.1-git
Tagging docker:17.03-git
Tagging docker:stable-git

$ test/run.sh docker:17.03.1-ce-git
testing docker:17.03.1-ce-git
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed
$ bashbrew build mariadb:10.1.23
Building bashbrew/cache:69a4a693803c7fe8bbea8a1ae0bfadf0ff8789fcde03d2640879168af4e73965 (mariadb:10.1.23)
Tagging mariadb:10.1.23
Tagging mariadb:10.1
Tagging mariadb:10
Tagging mariadb:latest

$ test/run.sh mariadb:10.1.23
testing mariadb:10.1.23
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'mysql-basics' [5/7].........passed
	'mysql-initdb' [6/7].........passed
	'mysql-log-bin' [7/7].........passed


$ bashbrew build mariadb:10.0.30
Building bashbrew/cache:6124815127fbf3037e447a0c4c488f493415ba79727d7cf3c94825cceb6a3dd6 (mariadb:10.0.30)
Tagging mariadb:10.0.30
Tagging mariadb:10.0

$ test/run.sh mariadb:10.0.30
testing mariadb:10.0.30
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'mysql-basics' [5/7].......passed
	'mysql-initdb' [6/7].......passed
	'mysql-log-bin' [7/7]........passed


$ bashbrew build mariadb:5.5.56
Building bashbrew/cache:866356bb0a22e83c80f6bf3c9eab6fb8abe9ec9d6ee8d434cbd6d542aa4897e5 (mariadb:5.5.56)
Tagging mariadb:5.5.56
Tagging mariadb:5.5
Tagging mariadb:5

$ test/run.sh mariadb:5.5.56
testing mariadb:5.5.56
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'mysql-basics' [5/7]......passed
	'mysql-initdb' [6/7]......passed
	'mysql-log-bin' [7/7]......passed
$ bashbrew build redmine:3.1.7
Building bashbrew/cache:a83c8a4889723ed1440e9fdccaf237f4e1be1c0194c8cff027fc936e43a5d4d4 (redmine:3.1.7)
Tagging redmine:3.1.7
Tagging redmine:3.1

$ test/run.sh redmine:3.1.7
testing redmine:3.1.7
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'redmine-basics' [5/5]..........passed


$ bashbrew build redmine:3.1.7-passenger
Building bashbrew/cache:b895913b651dbebaf35cfd86a5359dba13913fcf4197b43b52a5aea32dfdc997 (redmine:3.1.7-passenger)
Tagging redmine:3.1.7-passenger
Tagging redmine:3.1-passenger

$ test/run.sh redmine:3.1.7-passenger
testing redmine:3.1.7-passenger
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'redmine-basics' [5/5]........passed


$ bashbrew build redmine:3.2.6
Building bashbrew/cache:68c4470a842bb3dd365da87ff9f6d2764301c337d5a06580e39d0fa01f3b37d4 (redmine:3.2.6)
Tagging redmine:3.2.6
Tagging redmine:3.2

$ test/run.sh redmine:3.2.6
testing redmine:3.2.6
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'redmine-basics' [5/5]..........passed


$ bashbrew build redmine:3.2.6-passenger
Building bashbrew/cache:09324db74b626417ea7b463980a056228ccddc8b00807f9f8893634e698e14ba (redmine:3.2.6-passenger)
Tagging redmine:3.2.6-passenger
Tagging redmine:3.2-passenger

$ test/run.sh redmine:3.2.6-passenger
testing redmine:3.2.6-passenger
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'redmine-basics' [5/5].........passed


$ bashbrew build redmine:3.3.3
Building bashbrew/cache:3de75f6f8610210fa80436c6cd487d51b8856b3e8ea2fff53a37d08c0e8e2b1e (redmine:3.3.3)
Tagging redmine:3.3.3
Tagging redmine:3.3
Tagging redmine:3
Tagging redmine:latest

$ test/run.sh redmine:3.3.3
testing redmine:3.3.3
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'redmine-basics' [5/5]..........passed


$ bashbrew build redmine:3.3.3-passenger
Building bashbrew/cache:a94de4233fa46bb0e497db8b4856aee8e5e9b7c6c588e53817fb3549f26993d1 (redmine:3.3.3-passenger)
Tagging redmine:3.3.3-passenger
Tagging redmine:3.3-passenger
Tagging redmine:3-passenger
Tagging redmine:passenger

$ test/run.sh redmine:3.3.3-passenger
testing redmine:3.3.3-passenger
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'redmine-basics' [5/5]..........passed

@yosifkit yosifkit merged commit 9f725b3 into docker-library:master May 3, 2017
@yosifkit yosifkit deleted the update-docker-library branch May 3, 2017 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants