Skip to content

Commit f26fb18

Browse files
authored
Merge pull request #55 from wollomatic/develop
1.8.0
2 parents 1343e5b + b9077b6 commit f26fb18

File tree

10 files changed

+763
-36
lines changed

10 files changed

+763
-36
lines changed

.github/workflows/docker-image-release.yaml

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,22 @@ jobs:
2121
with:
2222
args: ./...
2323

24+
- name: Set up Go
25+
uses: actions/setup-go@v5
26+
with:
27+
go-version: '1.24.5'
28+
29+
- name: Run Go tests
30+
run: go test ./...
31+
2432
- name: Extract tag name
2533
id: get_tag
26-
run: echo "::set-output name=VERSION::${GITHUB_REF#refs/tags/}"
34+
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
2735

2836
- name: Install Cosign
29-
uses: sigstore/cosign-installer@v3.8.1
37+
uses: sigstore/cosign-installer@v3.9.2
3038
with:
31-
cosign-release: 'v2.4.3'
39+
cosign-release: 'v2.5.3'
3240

3341
- name: Set up Docker Buildx
3442
uses: docker/setup-buildx-action@v3
@@ -46,9 +54,9 @@ jobs:
4654
username: ${{ github.actor }}
4755
password: ${{ secrets.GITHUB_TOKEN }}
4856

49-
- name: Build and push Docker image
50-
uses: docker/build-push-action@v5
51-
id: build-and-push
57+
- name: Build and push Docker Hub image
58+
uses: docker/build-push-action@v6
59+
id: push-dockerhub
5260
with:
5361
context: .
5462
platforms: linux/amd64,linux/arm/v7,linux/arm64
@@ -57,17 +65,27 @@ jobs:
5765
tags: |
5866
docker.io/wollomatic/socket-proxy:${{ steps.get_tag.outputs.VERSION }}
5967
docker.io/wollomatic/socket-proxy:1
60-
ghcr.io/wollomatic/socket-proxy:${{ steps.get_tag.outputs.VERSION }}
61-
ghcr.io/wollomatic/socket-proxy:1
6268
63-
- name: Sign images for Docker
64-
run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY docker.io/wollomatic/socket-proxy:${{ steps.get_tag.outputs.VERSION }}@${{ steps.build-and-push.outputs.digest }}
69+
- name: Sign Docker Hub image
70+
run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY docker.io/wollomatic/socket-proxy:${{ steps.get_tag.outputs.VERSION }}@${{ steps.push-dockerhub.outputs.digest }}
6571
env:
6672
COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
6773
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
6874

69-
- name: Sign images for GHCR
70-
run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY ghcr.io/wollomatic/socket-proxy:${{ steps.get_tag.outputs.VERSION }}@${{ steps.build-and-push.outputs.digest }}
75+
- name: Build and push GHCR image
76+
uses: docker/build-push-action@v6
77+
id: push-ghcr
78+
with:
79+
context: .
80+
platforms: linux/amd64,linux/arm/v7,linux/arm64
81+
push: true
82+
build-args: VERSION=${{ steps.get_tag.outputs.VERSION }}
83+
tags: |
84+
ghcr.io/wollomatic/socket-proxy:${{ steps.get_tag.outputs.VERSION }}
85+
ghcr.io/wollomatic/socket-proxy:1
86+
87+
- name: Sign GHCR image
88+
run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY ghcr.io/wollomatic/socket-proxy:${{ steps.get_tag.outputs.VERSION }}@${{ steps.push-ghcr.outputs.digest }}
7189
env:
7290
COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
73-
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
91+
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}

.github/workflows/docker-image-testing.yaml

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,18 @@ jobs:
2222
with:
2323
args: ./...
2424

25+
- name: Set up Go
26+
uses: actions/setup-go@v5
27+
with:
28+
go-version: '1.24.5'
29+
30+
- name: Run Go tests
31+
run: go test ./...
32+
2533
# - name: Install Cosign
26-
# uses: sigstore/cosign-installer@v3.8.1
34+
# uses: sigstore/cosign-installer@v3.9.2
2735
# with:
28-
# cosign-release: 'v2.4.3'
36+
# cosign-release: 'v2.5.3'
2937

3038
- name: Set up Docker Buildx
3139
uses: docker/setup-buildx-action@v3
@@ -43,28 +51,52 @@ jobs:
4351
username: ${{ github.actor }}
4452
password: ${{ secrets.GITHUB_TOKEN }}
4553

46-
- name: Build and push Docker image
47-
uses: docker/build-push-action@v5
48-
id: build-and-push
54+
- name: Build and push image to Docker Hub and GHCR
55+
uses: docker/build-push-action@v6
56+
id: push-all
4957
with:
5058
context: .
5159
platforms: linux/amd64,linux/arm/v7,linux/arm64
5260
push: true
5361
build-args: VERSION=testing-${{ github.sha }}
54-
tags: |
62+
tags: |
5563
docker.io/wollomatic/socket-proxy:testing
5664
docker.io/wollomatic/socket-proxy:testing-${{ github.sha }}
5765
ghcr.io/wollomatic/socket-proxy:testing
5866
ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }}
5967
68+
# - name: Build and push Docker Hub image
69+
# uses: docker/build-push-action@v5
70+
# id: push-dockerhub
71+
# with:
72+
# context: .
73+
# platforms: linux/amd64,linux/arm/v7,linux/arm64
74+
# push: true
75+
# build-args: VERSION=testing-${{ github.sha }}
76+
# tags: |
77+
# docker.io/wollomatic/socket-proxy:testing
78+
# docker.io/wollomatic/socket-proxy:testing-${{ github.sha }}
79+
#
6080
# - name: Sign Docker Hub image
61-
# run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY docker.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.build-and-push.outputs.digest }}
81+
# run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY docker.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.push-dockerhub.outputs.digest }}
6282
# env:
6383
# COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
6484
# COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
6585
#
66-
# - name: Sign GitHub Container Registry image
67-
# run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.build-and-push.outputs.digest }}
86+
# - name: Build and push GHCR image
87+
# uses: docker/build-push-action@v5
88+
# id: push-ghcr
89+
# with:
90+
# context: .
91+
# platforms: linux/amd64,linux/arm/v7,linux/arm64
92+
# push: true
93+
# build-args: VERSION=testing-${{ github.sha }}
94+
# tags: |
95+
# ghcr.io/wollomatic/socket-proxy:testing
96+
# ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }}
97+
#
98+
# - name: Sign GHCR image
99+
# run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.push-ghcr.outputs.digest }}
68100
# env:
69101
# COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
70-
# COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
102+
# COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM --platform=$BUILDPLATFORM golang:1.24.4-alpine3.22 AS build
2+
FROM --platform=$BUILDPLATFORM golang:1.24.5-alpine3.22 AS build
33
WORKDIR /application
44
COPY . ./
55
ARG TARGETOS

LICENSE

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,200 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
22+
23+
---
24+
Parts of this project, specifically the file cmd/internal/bindmount.go,
25+
contain source code licensed under the Apache License 2.0. See the comments
26+
in that file for details.
27+
The rest of the project is licensed under the MIT License.
28+
29+
Apache License
30+
Version 2.0, January 2004
31+
https://www.apache.org/licenses/
32+
33+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
34+
35+
1. Definitions.
36+
37+
"License" shall mean the terms and conditions for use, reproduction,
38+
and distribution as defined by Sections 1 through 9 of this document.
39+
40+
"Licensor" shall mean the copyright owner or entity authorized by
41+
the copyright owner that is granting the License.
42+
43+
"Legal Entity" shall mean the union of the acting entity and all
44+
other entities that control, are controlled by, or are under common
45+
control with that entity. For the purposes of this definition,
46+
"control" means (i) the power, direct or indirect, to cause the
47+
direction or management of such entity, whether by contract or
48+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
49+
outstanding shares, or (iii) beneficial ownership of such entity.
50+
51+
"You" (or "Your") shall mean an individual or Legal Entity
52+
exercising permissions granted by this License.
53+
54+
"Source" form shall mean the preferred form for making modifications,
55+
including but not limited to software source code, documentation
56+
source, and configuration files.
57+
58+
"Object" form shall mean any form resulting from mechanical
59+
transformation or translation of a Source form, including but
60+
not limited to compiled object code, generated documentation,
61+
and conversions to other media types.
62+
63+
"Work" shall mean the work of authorship, whether in Source or
64+
Object form, made available under the License, as indicated by a
65+
copyright notice that is included in or attached to the work
66+
(an example is provided in the Appendix below).
67+
68+
"Derivative Works" shall mean any work, whether in Source or Object
69+
form, that is based on (or derived from) the Work and for which the
70+
editorial revisions, annotations, elaborations, or other modifications
71+
represent, as a whole, an original work of authorship. For the purposes
72+
of this License, Derivative Works shall not include works that remain
73+
separable from, or merely link (or bind by name) to the interfaces of,
74+
the Work and Derivative Works thereof.
75+
76+
"Contribution" shall mean any work of authorship, including
77+
the original version of the Work and any modifications or additions
78+
to that Work or Derivative Works thereof, that is intentionally
79+
submitted to Licensor for inclusion in the Work by the copyright owner
80+
or by an individual or Legal Entity authorized to submit on behalf of
81+
the copyright owner. For the purposes of this definition, "submitted"
82+
means any form of electronic, verbal, or written communication sent
83+
to the Licensor or its representatives, including but not limited to
84+
communication on electronic mailing lists, source code control systems,
85+
and issue tracking systems that are managed by, or on behalf of, the
86+
Licensor for the purpose of discussing and improving the Work, but
87+
excluding communication that is conspicuously marked or otherwise
88+
designated in writing by the copyright owner as "Not a Contribution."
89+
90+
"Contributor" shall mean Licensor and any individual or Legal Entity
91+
on behalf of whom a Contribution has been received by Licensor and
92+
subsequently incorporated within the Work.
93+
94+
2. Grant of Copyright License. Subject to the terms and conditions of
95+
this License, each Contributor hereby grants to You a perpetual,
96+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
97+
copyright license to reproduce, prepare Derivative Works of,
98+
publicly display, publicly perform, sublicense, and distribute the
99+
Work and such Derivative Works in Source or Object form.
100+
101+
3. Grant of Patent License. Subject to the terms and conditions of
102+
this License, each Contributor hereby grants to You a perpetual,
103+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
104+
(except as stated in this section) patent license to make, have made,
105+
use, offer to sell, sell, import, and otherwise transfer the Work,
106+
where such license applies only to those patent claims licensable
107+
by such Contributor that are necessarily infringed by their
108+
Contribution(s) alone or by combination of their Contribution(s)
109+
with the Work to which such Contribution(s) was submitted. If You
110+
institute patent litigation against any entity (including a
111+
cross-claim or counterclaim in a lawsuit) alleging that the Work
112+
or a Contribution incorporated within the Work constitutes direct
113+
or contributory patent infringement, then any patent licenses
114+
granted to You under this License for that Work shall terminate
115+
as of the date such litigation is filed.
116+
117+
4. Redistribution. You may reproduce and distribute copies of the
118+
Work or Derivative Works thereof in any medium, with or without
119+
modifications, and in Source or Object form, provided that You
120+
meet the following conditions:
121+
122+
(a) You must give any other recipients of the Work or
123+
Derivative Works a copy of this License; and
124+
125+
(b) You must cause any modified files to carry prominent notices
126+
stating that You changed the files; and
127+
128+
(c) You must retain, in the Source form of any Derivative Works
129+
that You distribute, all copyright, patent, trademark, and
130+
attribution notices from the Source form of the Work,
131+
excluding those notices that do not pertain to any part of
132+
the Derivative Works; and
133+
134+
(d) If the Work includes a "NOTICE" text file as part of its
135+
distribution, then any Derivative Works that You distribute must
136+
include a readable copy of the attribution notices contained
137+
within such NOTICE file, excluding those notices that do not
138+
pertain to any part of the Derivative Works, in at least one
139+
of the following places: within a NOTICE text file distributed
140+
as part of the Derivative Works; within the Source form or
141+
documentation, if provided along with the Derivative Works; or,
142+
within a display generated by the Derivative Works, if and
143+
wherever such third-party notices normally appear. The contents
144+
of the NOTICE file are for informational purposes only and
145+
do not modify the License. You may add Your own attribution
146+
notices within Derivative Works that You distribute, alongside
147+
or as an addendum to the NOTICE text from the Work, provided
148+
that such additional attribution notices cannot be construed
149+
as modifying the License.
150+
151+
You may add Your own copyright statement to Your modifications and
152+
may provide additional or different license terms and conditions
153+
for use, reproduction, or distribution of Your modifications, or
154+
for any such Derivative Works as a whole, provided Your use,
155+
reproduction, and distribution of the Work otherwise complies with
156+
the conditions stated in this License.
157+
158+
5. Submission of Contributions. Unless You explicitly state otherwise,
159+
any Contribution intentionally submitted for inclusion in the Work
160+
by You to the Licensor shall be under the terms and conditions of
161+
this License, without any additional terms or conditions.
162+
Notwithstanding the above, nothing herein shall supersede or modify
163+
the terms of any separate license agreement you may have executed
164+
with Licensor regarding such Contributions.
165+
166+
6. Trademarks. This License does not grant permission to use the trade
167+
names, trademarks, service marks, or product names of the Licensor,
168+
except as required for reasonable and customary use in describing the
169+
origin of the Work and reproducing the content of the NOTICE file.
170+
171+
7. Disclaimer of Warranty. Unless required by applicable law or
172+
agreed to in writing, Licensor provides the Work (and each
173+
Contributor provides its Contributions) on an "AS IS" BASIS,
174+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
175+
implied, including, without limitation, any warranties or conditions
176+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
177+
PARTICULAR PURPOSE. You are solely responsible for determining the
178+
appropriateness of using or redistributing the Work and assume any
179+
risks associated with Your exercise of permissions under this License.
180+
181+
8. Limitation of Liability. In no event and under no legal theory,
182+
whether in tort (including negligence), contract, or otherwise,
183+
unless required by applicable law (such as deliberate and grossly
184+
negligent acts) or agreed to in writing, shall any Contributor be
185+
liable to You for damages, including any direct, indirect, special,
186+
incidental, or consequential damages of any character arising as a
187+
result of this License or out of the use or inability to use the
188+
Work (including but not limited to damages for loss of goodwill,
189+
work stoppage, computer failure or malfunction, or any and all
190+
other commercial damages or losses), even if such Contributor
191+
has been advised of the possibility of such damages.
192+
193+
9. Accepting Warranty or Additional Liability. While redistributing
194+
the Work or Derivative Works thereof, You may choose to offer,
195+
and charge a fee for, acceptance of support, warranty, indemnity,
196+
or other liability obligations and/or rights consistent with this
197+
License. However, in accepting such obligations, You may act only
198+
on Your own behalf and on Your sole responsibility, not on behalf
199+
of any other Contributor, and only if You agree to indemnify,
200+
defend, and hold each Contributor harmless for any liability
201+
incurred by, or claims asserted against, such Contributor by reason
202+
of your accepting any such warranty or additional liability.
203+
204+
END OF TERMS AND CONDITIONS
205+
206+
Copyright 2013-2018 Docker, Inc.
207+
208+
Licensed under the Apache License, Version 2.0 (the "License");
209+
you may not use this file except in compliance with the License.
210+
You may obtain a copy of the License at
211+
212+
https://www.apache.org/licenses/LICENSE-2.0
213+
214+
Unless required by applicable law or agreed to in writing, software
215+
distributed under the License is distributed on an "AS IS" BASIS,
216+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
217+
See the License for the specific language governing permissions and
218+
limitations under the License.

0 commit comments

Comments
 (0)