This is an automated email from the ASF dual-hosted git repository.
d4rkstar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openserverless.git
The following commit(s) were added to refs/heads/main by this push:
new e2b4052 Fixes for the build (#201)
e2b4052 is described below
commit e2b4052b4196e3589fac1b8f1a8fe3095996574e
Author: Michele Sciabarra <[email protected]>
AuthorDate: Sun Jun 7 19:05:26 2026 +0200
Fixes for the build (#201)
* gitmodules fix admin-api and streamer
* updated build with bug fixes
* fix
---------
Co-authored-by: Trustable User <[email protected]>
Co-authored-by: Michele Sciabarra <[email protected]>
Co-authored-by: Michele Sciabarra <[email protected]>
---
.gitmodules | 6 ++++--
README.md | 69 ++++++++++++++++++++++++------------------------------------
Taskfile.yml | 22 +++++++++++++------
olaris | 2 +-
olaris-op | 2 +-
runtimes | 2 +-
6 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 3c7500b..b608813 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,7 +32,9 @@
branch = main
[submodule "streamer"]
path = streamer
- url = [email protected]:apache/openserverless-streamer
+ url = https://github.com/apache/openserverless-streamer
+ branch = main
[submodule "admin-api"]
path = admin-api
- url = [email protected]:apache/openserverless-admin-api
+ url = https://github.com/apache/openserverless-admin-api
+ branch = main
diff --git a/README.md b/README.md
index bef7ed7..0a39f51 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Apache OpenServerless (incubating)
-Welcome to [Apache OpenServerless](https://openserverless.apache.org), an
incubating project at the [Apache Software Foundation](https://www.apache.org)
+Welcome to [Apache OpenServerless](https://openserverless.apache.org), an
incubating project at the [Apache Software Foundation](https://www.apache.org)
- If you want to **install** Apache OpenServerless in cloud go
[here](https://openserverless.apache.org/docs/installation/).
- If you want to **understand** what this project is check the [original
proposal](https://cwiki.apache.org/confluence/display/INCUBATOR/OpenServerlessProposal).
@@ -34,52 +34,39 @@ On windows,
then enable docker to be used in the distro `Ubuntu-24.04`
-Access the distro (`wsl -d Ubuntu-24.04` ) and run:
+Access the distro (`wsl -d Ubuntu-24.04` ), configure a new user, then
execute:
-- `sudo snap install go --classic`
-- `sudo snap install task --classic`
+```
+sudo apt-get update
+sudo apt-get -y install jq
+sudo snap install go --classic
+sudo snap install task --classic
+sudo snap install kubectl --classic
+```
## Prepare Ubuntu Linux
-Install docker with
+Setup for a plain Ubuntu Linux with an user with sudo power:
-- `curl -sL get.docker.com | sudo bash`
-- `sudo usermod -aG docker $USER`
-- `newgrp`
-
-Then
-
-- `sudo snap install go --classic`
-- `sudo snap install task --classic`
+```
+sudo apt-get update
+sudo apt-get -y install jq
+sudo snap install go --classic
+sudo snap install task --classic
+sudo snap install kubectl --classic
+curl -sL get.docker.com | sudo bash
+sudo usermod -aG docker $USER
+newgrp docker
+docker ps
+```
## Procedure
-### 1. Get the sources
-
-Clone all the modules and submodules recursively
-
-`git clone https://github.com/apache/openserverless --recurse-submodules`
-
-and enter in the folder
-
-`cd openserverless`
-
-### 2. Build
-
-First clean everything
-
-`task clean`
-
-then build:
-
-`task build`
-
-This will
-- build the cli
-- build the operator image
-- build the runtimes
-- build accessories (streamer and system api)
-
-3. Tests
+```
+git clone https://github.com/apache/openserverless --recurse-submodules
+cd openserverless
+task build
+task setup
+```
-TODO: execute the test suite
+TODO: `task test`
\ No newline at end of file
diff --git a/Taskfile.yml b/Taskfile.yml
index aa688fa..c0be831 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -9,10 +9,10 @@ vars:
OPERATOR_SRC: "{{.OPERATOR_IMG}}:{{.OPERATOR_TAG}}"
STREAMER_TAG: "{{.OPERATOR_TAG}}"
- STREAMER_SRC:
"registry.hub.docker.com/apache/openserverless-streamer:{{.STREAMER_TAG}}"
+ STREAMER_SRC: "docker.io/apache/openserverless-streamer:{{.STREAMER_TAG}}"
ADMIN_API_TAG: "{{.OPERATOR_TAG}}"
- ADMIN_API_SRC:
"registry.hub.docker.com/apache/openserverless-admin-api:{{.ADMIN_API_TAG}}"
+ ADMIN_API_SRC: "docker.io/apache/openserverless-admin-api:{{.ADMIN_API_TAG}}"
RUNTIMES_TAG: "{{.OPERATOR_TAG}}"
@@ -33,7 +33,7 @@ tasks:
env:
TGT:
sh: |
- B64="$(echo {{.SRC}} | /usr/bin/base64 -w0 )"
+ B64="$(echo -n {{.SRC}} | /usr/bin/base64 -w0)"
echo ~/.ops/{{OS}}-{{ARCH}}/images/kind/$B64
cmds:
- echo Saving {{.SRC}} in "$TGT"
@@ -71,7 +71,7 @@ tasks:
cmds:
- echo Building {{.STREAMER_SRC}}
- git tag -d $(git tag) && git tag {{.STREAMER_TAG}}
- - echo -e "NAMESPACE=apache\nREGISTRY=apache\n" >.env
+ - echo -e "NAMESPACE=apache\nREGISTRY=dockerhub\n" >.env
- task buildx
- task: image-save
vars:
@@ -86,7 +86,7 @@ tasks:
cmds:
- echo Building {{.ADMIN_API_SRC}}
- git tag -d $(git tag) && git tag {{.STREAMER_TAG}}
- - echo -e "NAMESPACE=apache\nREGISTRY=apache\n" >.env
+ - echo -e "NAMESPACE=apache\nREGISTRY=dockerhub\n" >.env
- task buildx
- task: image-save
vars:
@@ -126,9 +126,9 @@ tasks:
- for: { var: IMAGES, split: "\n", as: IMG }
task: image-save
vars:
- SRC: "registry.hub.docker.com/{{.IMG}}"
+ SRC: "docker.io/{{.IMG}}"
TGT:
- sh: echo ~/.ops/{{OS}}-{{ARCH}}/images/kind/$(echo
registry.hub.docker.com/{{.IMG}} | /usr/bin/base64 -w0)
+ sh: echo ~/.ops/{{OS}}-{{ARCH}}/images/kind/$(echo
docker.io/{{.IMG}} | /usr/bin/base64 -w0)
build:
desc: build all
@@ -140,3 +140,11 @@ tasks:
- task: admin-api
- task: opsroot
- task: runtimes
+
+ setup:
+ desc: setup
+ cmds:
+ - |
+ export PATH="$PWD:$PATH"
+ ops setup mini
+
diff --git a/olaris b/olaris
index eee896f..b5bf768 160000
--- a/olaris
+++ b/olaris
@@ -1 +1 @@
-Subproject commit eee896f2c11b8ca114ec39a83df0c8acfccb332c
+Subproject commit b5bf7688ad76fa56394b70681d21681a7c93f26b
diff --git a/olaris-op b/olaris-op
index f57d7bb..84e48da 160000
--- a/olaris-op
+++ b/olaris-op
@@ -1 +1 @@
-Subproject commit f57d7bbe577810ffb0f635078d6d96dd3c1bff9a
+Subproject commit 84e48da96c5253120f19b5d03f7400fdbeca94bf
diff --git a/runtimes b/runtimes
index fcf25e0..d1bc9ff 160000
--- a/runtimes
+++ b/runtimes
@@ -1 +1 @@
-Subproject commit fcf25e0e88a0c333ca85794fb165ba00f88b9d36
+Subproject commit d1bc9ffee4634899241b60210c0323740deda066
