From 3bd2e0165566055a0a8a5cd58e2c207032c6b617 Mon Sep 17 00:00:00 2001 From: Francesco Timperi Tiberi Date: Sun, 1 Jun 2025 14:52:53 +0000 Subject: [PATCH 1/4] chore: aligned to latest OpenWhisk working PR --- .devcontainer/Dockerfile | 8 ++++---- .devcontainer/devcontainer.json | 22 +++++++++++++--------- Taskfile.yml | 3 --- openwhisk | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9cc60af..3742e9f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -16,7 +16,7 @@ # under the License. # -FROM ubuntu:20.04 +FROM ubuntu:22.04 LABEL maintainer="Michele Sciabarra michele@nuvolaris.io, Francesco Timperi Tiberi francesco.timperi@gmail.com" ARG TARGETPLATFORM @@ -34,14 +34,14 @@ RUN apt-get update && apt-get -y upgrade &&\ socat telnet inetutils-ping \ unzip vim telnet less sudo git \ python3 python3-pip gcc g++ make \ - silversearcher-ag zip lsof + silversearcher-ag zip lsof netcat # install java (amazon corretto) and libs RUN pip3 install --upgrade pip setuptools six # python2 stuff RUN ln -sf /usr/bin/python3 /usr/bin/python ;\ curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py ;\ python get-pip.py ;\ - python -m pip install docker==5.0.0 ansible==4.1.0 jinja2==3.0.1 couchdb==1.2 httplib2==0.19.1 requests==2.25.1 six==1.16.0 + python -m pip install docker==5.0.0 ansible==2.8.18 jinja2==3.0.1 couchdb==1.2 httplib2==0.19.1 requests==2.25.1 six==1.16.0 flake8 # docker RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu bionic stable" > /etc/apt/sources.list.d/docker.list ;\ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor > /usr/share/keyrings/docker-archive-keyring.gpg ;\ @@ -110,7 +110,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ fi ENV HOME=/home/openserverless -ENV ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing" +ENV ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing -e container_pool_akka_client=false" ENV GRADLE_PROJS_SKIP="" WORKDIR /home/openserverless ENTRYPOINT [ "/usr/bin/socat","UNIX-LISTEN:/var/run/docker.sock,fork,mode=660,user=openserverless","UNIX-CONNECT:/var/run/docker-host.sock" ] \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0216312..403bd03 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -16,7 +16,7 @@ // under the License. { "name": "openserverless", - "image": "ghcr.io/francescotimperi/devow:ops-jdk17.25052915", + "image": "ghcr.io/francescotimperi/devow:ops-jdk17.25060115", //"build": { "dockerfile": "Dockerfile" }, "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker-host.sock,type=bind", @@ -24,14 +24,18 @@ ], "remoteUser": "openserverless", "overrideCommand": false, - "extensions": [ - "stuart.unique-window-colors", - "oderwat.indent-rainbow", - "eamodio.gitlens", - "mhutchie.git-graph", - "scalameta.metals", - "vscjava.vscode-java-test" - ], + "customizations": { + "vscode": { + "extensions": [ + "stuart.unique-window-colors", + "oderwat.indent-rainbow", + "eamodio.gitlens", + "mhutchie.git-graph", + "scalameta.metals", + "vscjava.vscode-java-test" + ] + } + }, "runArgs": [ "--network", "host", "--add-host", "host.docker.internal:127.0.0.1" diff --git a/Taskfile.yml b/Taskfile.yml index b5a52ea..557558b 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -277,6 +277,3 @@ tasks: dir: openwhisk cmds: - ./gradlew distDocker -PdockerMultiArchBuild=true -PdockerRegistry={{.DOCKER_REGISTRY}} -PdockerImagePrefix=openwhisk2 -PdockerImageTag={{.TAG}} - - - diff --git a/openwhisk b/openwhisk index 36d6986..214843a 160000 --- a/openwhisk +++ b/openwhisk @@ -1 +1 @@ -Subproject commit 36d69863efb6396014ca5ae50a3282abfde2bae6 +Subproject commit 214843af3d1018d059336ada473bf3fdeffe108d From 3f593073b28935cb9e1318c45c438a7e792025d3 Mon Sep 17 00:00:00 2001 From: Francesco Timperi Tiberi Date: Sun, 1 Jun 2025 20:14:03 +0200 Subject: [PATCH 2/4] chore: temporary removed openwhisk --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 5 +++-- .gitmodules | 4 +--- openwhisk | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) delete mode 160000 openwhisk diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3742e9f..129c274 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -110,7 +110,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ fi ENV HOME=/home/openserverless -ENV ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing -e container_pool_akka_client=false" +ENV ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=testing -e container_pool_akka_client=false -e jmxremote_enabled=false -e elasticsearch.version=7.8.0" ENV GRADLE_PROJS_SKIP="" WORKDIR /home/openserverless ENTRYPOINT [ "/usr/bin/socat","UNIX-LISTEN:/var/run/docker.sock,fork,mode=660,user=openserverless","UNIX-CONNECT:/var/run/docker-host.sock" ] \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 403bd03..38b2835 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -16,11 +16,12 @@ // under the License. { "name": "openserverless", - "image": "ghcr.io/francescotimperi/devow:ops-jdk17.25060115", + "image": "ghcr.io/francescotimperi/devow:ops-jdk17.25060119", //"build": { "dockerfile": "Dockerfile" }, "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker-host.sock,type=bind", - "type=bind,source=${env:HOME}/.ssh,target=/home/openserverless/.ssh" + "type=bind,source=${env:HOME}/.ssh,target=/home/openserverless/.ssh", + "source=/var/tmp/wskconf,target=/var/tmp/wskconf,type=bind" ], "remoteUser": "openserverless", "overrideCommand": false, diff --git a/.gitmodules b/.gitmodules index e1877da..8b13789 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1 @@ -[submodule "openwhisk"] - path = openwhisk - url = git@github.com:francescotimperi/openwhisk.git + diff --git a/openwhisk b/openwhisk deleted file mode 160000 index 214843a..0000000 --- a/openwhisk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 214843af3d1018d059336ada473bf3fdeffe108d From bc18e42aa41e2037551f336b9e0ac60465257c32 Mon Sep 17 00:00:00 2001 From: Francesco Timperi Tiberi Date: Sun, 1 Jun 2025 20:15:44 +0200 Subject: [PATCH 3/4] feat: uses official github OpenWhisk master branch --- .gitmodules | 3 +++ openwhisk | 1 + 2 files changed, 4 insertions(+) create mode 160000 openwhisk diff --git a/.gitmodules b/.gitmodules index 8b13789..0840265 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1 +1,4 @@ +[submodule "openwhisk"] + path = openwhisk + url = git@github.com:apache/openwhisk.git diff --git a/openwhisk b/openwhisk new file mode 160000 index 0000000..0f48cd5 --- /dev/null +++ b/openwhisk @@ -0,0 +1 @@ +Subproject commit 0f48cd5b32adc3867df57e0f3ad8f5acd9ea9d8e From 91eaeee189da018545e3800fa8f6cc3553c99d48 Mon Sep 17 00:00:00 2001 From: Francesco Timperi Tiberi Date: Sun, 1 Jun 2025 20:16:06 +0200 Subject: [PATCH 4/4] feat: uses official github OpenWhisk master branch --- .gitmodules | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 0840265..2ae82e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ - [submodule "openwhisk"] path = openwhisk url = git@github.com:apache/openwhisk.git