Skip to content

Commit 6a59bee

Browse files
Fix artifacts naming, update READMEs
1 parent aaf853c commit 6a59bee

File tree

5 files changed

+13
-59
lines changed

5 files changed

+13
-59
lines changed

.github/actions/build-docker-image/action.yaml .github/actions/build-container-image/action.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# SPDX-License-Identifier: Apache-2.0
1616

17-
name: Build and push docker container
17+
name: Build and push container image
1818

1919
inputs:
2020
arch:
@@ -59,7 +59,7 @@ runs:
5959
password: ${{ inputs.token }}
6060

6161
# https://github.com/docker/build-push-action
62-
- name: Build and push docker container to ghcr.io
62+
- name: Build and push docker image to ghcr.io
6363
id: build-and-push
6464
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
6565
with:
@@ -72,5 +72,5 @@ runs:
7272
GITHUB_RUN_NUMBER=${{ inputs.run_number }}
7373
GITHUB_COMMIT_HASH=${{ inputs.commit_hash }}
7474
tags: |
75-
ghcr.io/${{ steps.repo_name.outputs.lowercase }}/sua:latest_${{ inputs.arch }}
75+
ghcr.io/${{ steps.repo_name.outputs.lowercase }}/self-update-agent:latest_${{ inputs.arch }}
7676

.github/actions/build-native-binary/action.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ runs:
7676

7777
- name: Compress artifacts
7878
run: |
79-
tar -czvf sua-${{ inputs.arch }}-build-${{ inputs.run_number }}.tar.gz \
80-
--transform s/dist_${{ inputs.arch }}/sua-${{ inputs.arch }}-build-${{ inputs.run_number }}/ \
79+
tar -czvf self-update-agent-${{ inputs.arch }}-build-${{ inputs.run_number }}.tar.gz \
80+
--transform s/dist_${{ inputs.arch }}/self-update-agent-${{ inputs.arch }}-build-${{ inputs.run_number }}/ \
8181
--exclude=dist_${{ inputs.arch }}/lib/cmake \
8282
--exclude=dist_${{ inputs.arch }}/lib/pkgconfig \
8383
dist_${{ inputs.arch }}/bin/sdv-self-update-agent \

.github/workflows/main.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# SPDX-License-Identifier: Apache-2.0
1616

17-
name: CI
17+
name: Build All
1818

1919
on:
2020
push:
@@ -68,10 +68,9 @@ jobs:
6868

6969
- name: Create merged manifest and push
7070
env:
71-
REPO: ghcr.io/softwaredefinedvehicle/sdv-self-update-agent
71+
REPO: ghcr.io/${{ steps.repo_name.outputs.lowercase }}
7272
run: |
73-
docker buildx imagetools create -t ghcr.io/${{ steps.repo_name.outputs.lowercase }}/sua:latest ghcr.io/${{ steps.repo_name.outputs.lowercase }}/sua:latest_arm64 ghcr.io/${{ steps.repo_name.outputs.lowercase }}/sua:latest_amd64
74-
73+
docker buildx imagetools create -t ghcr.io/${{ steps.repo_name.outputs.lowercase }}/self-update-agent:build-${{ github.run_number }} ghcr.io/${{ steps.repo_name.outputs.lowercase }}/self-update-agent:build-${{ github.run_number }}_arm64 ghcr.io/${{ steps.repo_name.outputs.lowercase }}/self-update-agent:build-${{ github.run_number }}_amd64
7574
build-native-binary:
7675
runs-on: ubuntu-latest
7776
strategy:
@@ -92,8 +91,8 @@ jobs:
9291
- name: Upload ${{ matrix.arch }} artifact to workspace
9392
uses: actions/upload-artifact@v3
9493
with:
95-
name: sua-${{ matrix.arch }}-build-${{ github.run_number }}.tar.gz
96-
path: sua-${{ matrix.arch }}-build-${{ github.run_number }}.tar.gz
94+
name: self-update-agent-${{ matrix.arch }}-build-${{ github.run_number }}.tar.gz
95+
path: self-update-agent-${{ matrix.arch }}-build-${{ github.run_number }}.tar.gz
9796

9897
upload-native-binary:
9998
runs-on: ubuntu-latest
@@ -114,5 +113,5 @@ jobs:
114113
prerelease: true
115114
automatic_release_tag: build_${{ github.run_number }}
116115
title: "Build ${{ github.run_number }}"
117-
files: "**/sua-*-build-${{ github.run_number }}.tar.gz"
116+
files: "**/self-update-agent-*-build-${{ github.run_number }}.tar.gz"
118117

README.md

+2-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Apache 2.0
33

44
# Contribution
5-
Follow guidelines from Eclipse Leda: https://github.com/SoftwareDefinedVehicle/sdv-edge-distro-yocto/blob/main/README.md
5+
Follow guidelines from Eclipse Leda: https://eclipse-leda.github.io/leda/docs/project-info/contribution-guidelines
66

77
# Security Policy
88
This project implements the Eclipse Foundation Security Policy: https://www.eclipse.org/security
@@ -80,7 +80,7 @@ SUA supports 2 protocols depending on configuration: [link](docs/k8s.md) for Kub
8080
SUA links to some 3rd party libraries, which are fetched as submodules, therefore the cloning shall be performed with recursive option:
8181

8282
```
83-
git clone --recursive https://github.boschdevcloud.com/sdv/sdv-self-update-agent.git
83+
git clone --recursive https://github.com/eclipse-leda/leda-contrib-self-update-agent.git
8484
```
8585
or if was cloned non recursively
8686
```
@@ -96,8 +96,3 @@ Instructions for deploying are available on: [link](docs/deploying/README.md)
9696

9797
# HowTo Test
9898
Instructions for testing are available on: [link](docs/testing/README.md)
99-
100-
101-
102-
103-

docs/building/README.md

-40
Original file line numberDiff line numberDiff line change
@@ -82,36 +82,6 @@ This project provides the `.devcontainer`, which some of required for building t
8282

8383
If the docker and VS proxy settings are correctly set, the .devcontainer environment shall work on windows out of the box.
8484

85-
### Fix for OSD6 Linux distribution
86-
87-
For the case when using local VS Code (on OSD6) and opening in the remote container, the adjustment of proxy settings is necessary:
88-
89-
```
90-
vim /opt/osd/proxy/config.ini
91-
```
92-
93-
and then append additional server address for binding:
94-
95-
```
96-
[server]
97-
binds = 127.0.0.1:3128,172.17.0.1:3128
98-
```
99-
100-
After this restart OSD proxy
101-
102-
```
103-
osd-proxy-restart
104-
```
105-
106-
Then in the .devcontainer/Dockerfile activate those lines
107-
108-
```
109-
ENV http_proxy "http://172.17.0.1:3128"
110-
ENV https_proxy "http://172.17.0.1:3128"
111-
```
112-
113-
And finally trigger "Rebuild in Container" command from VSCode
114-
11585
# Containerized
11686

11787
SUA can be built as multi-arch image, and run inside of the container. This is preferred way of deployment, as it provides a necessary sandbox runtime environment and also allows to easily adjust the configuration settings (ports, ENV variables) via yaml.
@@ -147,13 +117,3 @@ docker buildx imagetools create -t ghcr.io/softwaredefinedvehicle/sdv-self-updat
147117
```
148118
docker run -it sua:latest
149119
```
150-
151-
## Hint
152-
153-
When running with proxy (corporate for example), it is helpful to uncomment following lines in the Dockerfile to configure the proxy properly
154-
155-
```
156-
#uncomment when building on OSD6 environment
157-
ENV http_proxy "http://172.17.0.1:3128"
158-
ENV https_proxy "http://172.17.0.1:3128"
159-
```

0 commit comments

Comments
 (0)