Update Docker image for Silverpeas version 6.2.2#11538
Update Docker image for Silverpeas version 6.2.2#11538tianon merged 1 commit intodocker-library:masterfrom
Conversation
|
The naughty test fails because it doesn't find the tag 6.1.3 and 6.2.2 from refs/heads/master. It is normal because in our own process each stable version of Silverpeas comes from its own branch (and hence not from master). For example, the tag 6.1.3 comes from the branch 6.1.x and 6.2.2 comes from the branch 6.2.x. So that we can then release a patch version of Silverpeas for each minor version. Do you have a suggestion here how we can fix it without breaking our own process? |
| Tags: 6.2.1, latest | ||
| GitCommit: e97e55f0a21aae880a0054ef764cea0cb37e1e05 | ||
| Tags: 6.2.2, latest | ||
| GitCommit: c6b68c650da8a95d9b258b4fe1f930fa9be737a6 |
There was a problem hiding this comment.
Yeah, we added a test in #11071 that ensures commits exist in the upstream. The fix is just telling it where to fetch the commits from. Adding a GitFetch: refs/heads/6.2.x line for the respective branch on each block should work.
Like this:
| GitCommit: c6b68c650da8a95d9b258b4fe1f930fa9be737a6 | |
| GitCommit: c6b68c650da8a95d9b258b4fe1f930fa9be737a6 | |
| GitFetch: refs/heads/6.2.x |
afac6ea to
d17d028
Compare
Diff for d17d028:diff --git a/_bashbrew-cat b/_bashbrew-cat
index de9a68a..0bc43da 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -5,7 +5,9 @@ Tags: 6.0.2
GitCommit: 189a4f2db783d5052add54f2c07ca7a3b860c685
Tags: 6.1.3
+GitFetch: refs/heads/6.1.x
GitCommit: 8577cb90ed86ef24248d1283f032c541a38d38ea
-Tags: 6.2.1, latest
-GitCommit: e97e55f0a21aae880a0054ef764cea0cb37e1e05
+Tags: 6.2.2, latest
+GitFetch: refs/heads/6.2.x
+GitCommit: c6b68c650da8a95d9b258b4fe1f930fa9be737a6
diff --git a/_bashbrew-list b/_bashbrew-list
index 8e86d30..dae528a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,4 @@
silverpeas:6.0.2
silverpeas:6.1.3
-silverpeas:6.2.1
+silverpeas:6.2.2
silverpeas:latest
diff --git a/silverpeas_latest/Dockerfile b/silverpeas_latest/Dockerfile
index 516d33b..224d279 100644
--- a/silverpeas_latest/Dockerfile
+++ b/silverpeas_latest/Dockerfile
@@ -87,9 +87,9 @@ ENV JAVA_HOME /docker-java-home
ENV SILVERPEAS_HOME /opt/silverpeas
ENV JBOSS_HOME /opt/wildfly
-ENV SILVERPEAS_VERSION=6.2.1
+ENV SILVERPEAS_VERSION=6.2.2
ENV WILDFLY_VERSION=20.0.1
-LABEL name="Silverpeas 6.2.1" description="Image to install and to run Silverpeas 6.2.1" vendor="Silverpeas" version="6.2.1" build=1
+LABEL name="Silverpeas 6.2.2" description="Image to install and to run Silverpeas 6.2.2" vendor="Silverpeas" version="6.2.2" build=1
# Fetch both Silverpeas and Wildfly and unpack them into /opt
RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-wildfly${WILDFLY_VERSION%.?.?}.zip \Relevant Maintainers:
|
|
Are 6.1.x and 6.0.x still actively supported release lines? Just as a reminder, removing tags here will remove them from the "Supported" section on the Hub readme (and will prevent us from spending cycles rebuilding them on the official build servers), but the tags will still be available to users who want them. (See https://github.com/docker-library/official-images#library-definition-files for more detail on this.) |
Currently 6.1.x is actively supported. 6.0.x is indeed no more supported. We will remove it from the lib def at a next release of Silverpeas (normally in the month). |
No description provided.