Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 ;\
Expand Down Expand Up @@ -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 -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" ]
25 changes: 15 additions & 10 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,27 @@
// under the License.
{
"name": "openserverless",
"image": "ghcr.io/francescotimperi/devow:ops-jdk17.25052915",
"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,
"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"
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "openwhisk"]
path = openwhisk
url = git@github.com:francescotimperi/openwhisk.git
url = git@github.com:apache/openwhisk.git
3 changes: 0 additions & 3 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,3 @@ tasks:
dir: openwhisk
cmds:
- ./gradlew distDocker -PdockerMultiArchBuild=true -PdockerRegistry={{.DOCKER_REGISTRY}} -PdockerImagePrefix=openwhisk2 -PdockerImageTag={{.TAG}}



Loading