Skip to content

Commit c377ce9

Browse files
style95dgrove-oss
style95
and
dgrove-oss
authored
Fix runtime tags in 2.0.0 branch (#5473)
* Fix runtime tags in 2.0.0 branch * Use nodejs-v20 image for standalone tests Co-authored-by: David Grove <[email protected]> * Use nodejs-v20 image for standalone tests Co-authored-by: David Grove <[email protected]> * Use the fixed tag for the openwhisk/example image * Change the api-gateway tag to 1.0.0 * Change the nodejs runtime tag to 1.22.0 --------- Co-authored-by: David Grove <[email protected]>
1 parent 44755a4 commit c377ce9

File tree

11 files changed

+33
-35
lines changed

11 files changed

+33
-35
lines changed

‎ansible/files/runtimes-nodeonly.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"image": {
2222
"prefix": "openwhisk",
2323
"name": "action-nodejs-v20",
24-
"tag": "nightly"
24+
"tag": "1.22.0"
2525
},
2626
"deprecated": false,
2727
"attached": {
@@ -40,7 +40,7 @@
4040
{
4141
"prefix": "openwhisk",
4242
"name": "dockerskeleton",
43-
"tag": "nightly"
43+
"tag": "1.15.0"
4444
}
4545
]
4646
}

‎ansible/files/runtimes.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"image": {
2121
"prefix": "openwhisk",
2222
"name": "action-nodejs-v18",
23-
"tag": "nightly"
23+
"tag": "1.22.0"
2424
},
2525
"deprecated": false,
2626
"attached": {
@@ -34,7 +34,7 @@
3434
"image": {
3535
"prefix": "openwhisk",
3636
"name": "action-nodejs-v20",
37-
"tag": "nightly"
37+
"tag": "1.22.0"
3838
},
3939
"deprecated": false,
4040
"attached": {
@@ -63,7 +63,7 @@
6363
"image": {
6464
"prefix": "openwhisk",
6565
"name": "action-python-v3.10",
66-
"tag": "nightly"
66+
"tag": "1.19.0"
6767
},
6868
"deprecated": false,
6969
"attached": {
@@ -77,7 +77,7 @@
7777
"image": {
7878
"prefix": "openwhisk",
7979
"name": "action-python-v3.11",
80-
"tag": "nightly"
80+
"tag": "1.19.0"
8181
},
8282
"deprecated": false,
8383
"attached": {
@@ -93,7 +93,7 @@
9393
"image": {
9494
"prefix": "openwhisk",
9595
"name": "action-swift-v5.3",
96-
"tag": "nightly"
96+
"tag": "1.18.0"
9797
},
9898
"deprecated": false,
9999
"attached": {
@@ -107,7 +107,7 @@
107107
"image": {
108108
"prefix": "openwhisk",
109109
"name": "action-swift-v5.7",
110-
"tag": "nightly"
110+
"tag": "1.18.0"
111111
},
112112
"deprecated": false,
113113
"attached": {
@@ -123,7 +123,7 @@
123123
"image": {
124124
"prefix": "openwhisk",
125125
"name": "java8action",
126-
"tag": "nightly"
126+
"tag": "1.19.0"
127127
},
128128
"deprecated": false,
129129
"attached": {
@@ -141,7 +141,7 @@
141141
"image": {
142142
"prefix": "openwhisk",
143143
"name": "action-php-v8.1",
144-
"tag": "nightly"
144+
"tag": "1.20.0"
145145
},
146146
"attached": {
147147
"attachmentName": "codefile",
@@ -161,7 +161,7 @@
161161
"image": {
162162
"prefix": "openwhisk",
163163
"name": "action-ruby-v2.5",
164-
"tag": "nightly"
164+
"tag": "1.17.0"
165165
}
166166
}
167167
],
@@ -177,7 +177,7 @@
177177
"image": {
178178
"prefix": "openwhisk",
179179
"name": "action-golang-v1.20",
180-
"tag": "nightly"
180+
"tag": "1.24.0"
181181
}
182182
}
183183
],
@@ -190,7 +190,7 @@
190190
"image": {
191191
"prefix": "openwhisk",
192192
"name": "action-dotnet-v3.1",
193-
"tag": "nightly"
193+
"tag": "1.17.0"
194194
},
195195
"attached": {
196196
"attachmentName": "codefile",
@@ -205,7 +205,7 @@
205205
"image": {
206206
"prefix": "openwhisk",
207207
"name": "action-dotnet-v6.0",
208-
"tag": "nightly"
208+
"tag": "1.17.0"
209209
},
210210
"attached": {
211211
"attachmentName": "codefile",
@@ -220,7 +220,7 @@
220220
"image": {
221221
"prefix": "openwhisk",
222222
"name": "action-rust-v1.34",
223-
"tag": "nightly"
223+
"tag": "1.3.0"
224224
},
225225
"deprecated": false,
226226
"attached": {
@@ -234,7 +234,7 @@
234234
{
235235
"prefix": "openwhisk",
236236
"name": "dockerskeleton",
237-
"tag": "nightly"
237+
"tag": "1.15.0"
238238
}
239239
]
240240
}

‎ansible/group_vars/all‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,7 @@ apigateway:
335335
port:
336336
api: 9000
337337
mgmt: 9001
338-
# Default to 'nightly', which tracks the head revision of the master branch of apigateway's gitrepo
339-
version: nightly
338+
version: 1.0.0
340339

341340
redis:
342341
version: 4.0

‎core/standalone/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ If you have docker and bash installed, you can launch the standalone openwhisk f
394394

395395
The script will start the standalone controller with Docker, and will also try to open the playground. It was tested on Linux, OSX and Windows with Git Bash. If a browser does not automatically open the OpenWhisk playground, you can access it at `http://localhost:3232`.
396396

397-
The default standalone controller image is published as `openwhisk/standalone:nightly` for convenience.
397+
The default standalone controller image is published as `openwhisk/standalone:2.0.0` for convenience.
398398

399399
If you do not want to execute arbitrary code straight from the net, you can look at [this script](start.sh), check it and run it when you feel safe.
400400

@@ -414,7 +414,7 @@ You can specify a different image to this script and/or pass additional paramete
414414

415415
e.g.
416416

417-
`bash <(curl -sL https://s.apache.org/openwhisk.sh) -e SOME_DOCKER_ENV=a openwhisk/standalone:nightly --no-ui`
417+
`bash <(curl -sL https://s.apache.org/openwhisk.sh) -e SOME_DOCKER_ENV=a openwhisk/standalone:2.0.0 --no-ui`
418418

419419
Extra args are useful to configure the JVM running OpenWhisk and to propagate additional environment variables to containers running images. This feature is useful for example to enable debugging for actions.
420420

‎core/standalone/src/main/resources/standalone.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ whisk {
121121
}
122122

123123
user-events {
124-
image = "openwhisk/user-events:nightly"
124+
image = "openwhisk/user-events:2.0.0"
125125
prometheus-image = "prom/prometheus:v2.5.0"
126126
grafana-image = "grafana/grafana:6.1.6"
127127
}

‎core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneDockerSupport.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ object StandaloneDockerSupport {
148148
}
149149

150150
def prePullImage(imageName: String)(implicit logging: Logging): Unit = {
151-
//docker images openwhisk/action-nodejs-v14:nightly
151+
//docker images openwhisk/action-nodejs-v14:1.22.0
152152
//REPOSITORY TAG IMAGE ID CREATED SIZE
153-
//openwhisk/action-nodejs-v14 nightly dbb0f8e1a050 5 days ago 967MB
153+
//openwhisk/action-nodejs-v14 1.22.0 dbb0f8e1a050 5 days ago 967MB
154154
val imageResult = s"$dockerCmd images $imageName".!!
155155
val imageExist = imageResult.linesIterator.toList.size > 1
156-
if (!imageExist || imageName.contains(":nightly")) {
156+
if (!imageExist || imageName.contains(":1.22.0")) {
157157
logging.info(this, s"Docker Pre pulling $imageName")
158158
s"$dockerCmd pull $imageName".!!
159159
}

‎core/standalone/start.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18-
IMAGE="${1:-openwhisk/standalone:nightly}"
18+
IMAGE="${1:-openwhisk/standalone:2.0.0}"
1919
shift
2020
docker run --rm -d \
2121
-h openwhisk --name openwhisk \

‎docs/actions.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Prewarmed containers are created when an invoker starts, they are created accord
9191
"image": {
9292
"prefix": "openwhisk",
9393
"name": "action-nodejs-v20",
94-
"tag": "nightly"
94+
"tag": "1.22.0"
9595
},
9696
"deprecated": false,
9797
"attached": {
@@ -122,7 +122,7 @@ With a reactive configuration, the number of prewarm containers is dynamically c
122122
"image": {
123123
"prefix": "openwhisk",
124124
"name": "action-nodejs-v20",
125-
"tag": "nightly"
125+
"tag": "1.22.0"
126126
},
127127
"deprecated": false,
128128
"attached": {

‎tools/github/runStandaloneTests.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ export KUBECONFIG="$(kind get kubeconfig-path)"
4545
kubectl config set-context --current --namespace=default
4646

4747
# This is required because it is timed out to pull the image during the test.
48-
docker pull openwhisk/action-nodejs-v14:nightly
49-
docker pull openwhisk/dockerskeleton:nightly
50-
docker pull openwhisk/example:nightly
48+
docker pull openwhisk/action-nodejs-v20:1.22.0
49+
docker pull openwhisk/dockerskeleton:1.15.0
50+
docker pull openwhisk/example:1.15.0
5151
docker pull openwhisk/apigateway:0.11.0
5252

5353
cd $ROOTDIR

‎tools/jenkins/apache/dockerhub.groovy‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ node('ubuntu') {
3434
def gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
3535
def shortCommit = gitCommit.take(7)
3636
sh "./gradlew clean"
37-
sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=nightly"
38-
sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=${shortCommit}"
37+
sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=2.0.0"
3938
}
4039
}
4140

0 commit comments

Comments
 (0)