Skip to content

Commit ac3f037

Browse files
iQQBotiQQBot
committed
[local-app] add other arch support
1 parent fad83ab commit ac3f037

File tree

5 files changed

+119
-16
lines changed

5 files changed

+119
-16
lines changed

‎components/dashboard/conf/Caddyfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
path /static/* /favicon* /manifest.json
1313
}
1414

15+
rewrite /static/bin/gitpod-local-companion-linux /static/bin/gitpod-local-companion-linux-amd64
16+
rewrite /static/bin/gitpod-local-companion-darwin /static/bin/gitpod-local-companion-darwin-amd64
17+
rewrite /static/bin/gitpod-local-companion-windows.exe /static/bin/gitpod-local-companion-windows-amd64.exe
18+
rewrite /static/bin/gitpod-local-companion-linux.gz /static/bin/gitpod-local-companion-linux-amd64.gz
19+
rewrite /static/bin/gitpod-local-companion-darwin.gz /static/bin/gitpod-local-companion-darwin-amd64.gz
20+
rewrite /static/bin/gitpod-local-companion-windows.exe.gz /static/bin/gitpod-local-companion-windows-amd64.exe.gz
21+
1522
@bin_asset {
1623
file
1724
path /static/bin/*

‎components/dashboard/leeway.Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@ RUN find . -type f \( -name '*.html' -o -name '*.js' -o -name '*.css' -o -name '
1616
RUN find . -type f \( -name '*.html' -o -name '*.js' -o -name '*.css' -o -name '*.png' -o -name '*.svg' -o -name '*.map' -o -name '*.json' \) \
1717
-exec /bin/sh -c 'brotli -v -q 11 -o "$1.br" "$1"' /bin/sh {} \;
1818

19-
COPY components-local-app--app/components-local-app--app-linux/local-app /www/static/bin/gitpod-local-companion-linux
20-
COPY components-local-app--app/components-local-app--app-darwin/local-app /www/static/bin/gitpod-local-companion-darwin
21-
COPY components-local-app--app/components-local-app--app-windows/local-app.exe /www/static/bin/gitpod-local-companion-windows.exe
19+
COPY components-local-app--app/components-local-app--app-linux-amd64/local-app /www/static/bin/gitpod-local-companion-linux-amd64
20+
COPY components-local-app--app/components-local-app--app-darwin-amd64/local-app /www/static/bin/gitpod-local-companion-darwin-amd64
21+
COPY components-local-app--app/components-local-app--app-windows-amd64/local-app.exe /www/static/bin/gitpod-local-companion-windows-amd64.exe
22+
COPY components-local-app--app/components-local-app--app-linux-arm64/local-app /www/static/bin/gitpod-local-companion-linux-arm64
23+
COPY components-local-app--app/components-local-app--app-darwin-arm64/local-app /www/static/bin/gitpod-local-companion-darwin-arm64
24+
COPY components-local-app--app/components-local-app--app-windows-386/local-app.exe /www/static/bin/gitpod-local-companion-windows-arm64.exe
25+
COPY components-local-app--app/components-local-app--app-windows-386/local-app.exe /www/static/bin/gitpod-local-companion-windows-386.exe
2226

2327
COPY components-gitpod-protocol--gitpod-schema/gitpod-schema.json /www/static/schemas/gitpod-schema.json
2428

25-
RUN for PLATFORM in linux darwin windows.exe;do \
26-
gzip -v -f -9 -k "/www/static/bin/gitpod-local-companion-$PLATFORM"; \
29+
RUN for FILE in `ls /www/static/bin/gitpod-local-companion*`;do \
30+
gzip -v -f -9 -k "$FILE"; \
2731
done
2832

2933
FROM caddy/caddy:2.4.0-alpine

‎components/local-app/BUILD.yaml

Lines changed: 89 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ packages:
44
config:
55
commands: [["echo"]]
66
deps:
7-
- :app-linux
8-
- :app-darwin
9-
- :app-windows
10-
- name: app-linux
7+
- :app-linux-amd64
8+
- :app-linux-arm64
9+
- :app-darwin-amd64
10+
- :app-darwin-arm64
11+
- :app-windows-386
12+
- :app-windows-amd64
13+
- :app-windows-arm64
14+
- name: app-linux-amd64
1115
type: go
1216
srcs:
1317
- go.mod
@@ -21,11 +25,50 @@ packages:
2125
env:
2226
- CGO_ENABLED=0
2327
- GOOS=linux
28+
- GOARCH=amd64
2429
prep:
2530
- ["cp", "_deps/components-local-app--version/version.txt", "version.txt"]
2631
config:
2732
packaging: app
28-
- name: app-darwin
33+
- name: app-linux-arm64
34+
type: go
35+
srcs:
36+
- go.mod
37+
- go.sum
38+
- "**/*.go"
39+
deps:
40+
- :version
41+
- components/supervisor-api/go:lib
42+
- components/gitpod-protocol/go:lib
43+
- components/local-app-api/go:lib
44+
env:
45+
- CGO_ENABLED=0
46+
- GOOS=linux
47+
- GOARCH=arm64
48+
prep:
49+
- ["cp", "_deps/components-local-app--version/version.txt", "version.txt"]
50+
config:
51+
packaging: app
52+
- name: app-darwin-amd64
53+
type: go
54+
srcs:
55+
- go.mod
56+
- go.sum
57+
- "**/*.go"
58+
deps:
59+
- :version
60+
- components/supervisor-api/go:lib
61+
- components/gitpod-protocol/go:lib
62+
- components/local-app-api/go:lib
63+
env:
64+
- CGO_ENABLED=0
65+
- GOOS=darwin
66+
- GOARCH=amd64
67+
prep:
68+
- ["cp", "_deps/components-local-app--version/version.txt", "version.txt"]
69+
config:
70+
packaging: app
71+
- name: app-darwin-arm64
2972
type: go
3073
srcs:
3174
- go.mod
@@ -39,11 +82,50 @@ packages:
3982
env:
4083
- CGO_ENABLED=0
4184
- GOOS=darwin
85+
- GOARCH=arm64
86+
prep:
87+
- ["cp", "_deps/components-local-app--version/version.txt", "version.txt"]
88+
config:
89+
packaging: app
90+
- name: app-windows-amd64
91+
type: go
92+
srcs:
93+
- go.mod
94+
- go.sum
95+
- "**/*.go"
96+
deps:
97+
- :version
98+
- components/supervisor-api/go:lib
99+
- components/gitpod-protocol/go:lib
100+
- components/local-app-api/go:lib
101+
env:
102+
- CGO_ENABLED=0
103+
- GOOS=windows
104+
- GOARCH=amd64
105+
prep:
106+
- ["cp", "_deps/components-local-app--version/version.txt", "version.txt"]
107+
config:
108+
packaging: app
109+
- name: app-windows-386
110+
type: go
111+
srcs:
112+
- go.mod
113+
- go.sum
114+
- "**/*.go"
115+
deps:
116+
- :version
117+
- components/supervisor-api/go:lib
118+
- components/gitpod-protocol/go:lib
119+
- components/local-app-api/go:lib
120+
env:
121+
- CGO_ENABLED=0
122+
- GOOS=windows
123+
- GOARCH=386
42124
prep:
43125
- ["cp", "_deps/components-local-app--version/version.txt", "version.txt"]
44126
config:
45127
packaging: app
46-
- name: app-windows
128+
- name: app-windows-arm64
47129
type: go
48130
srcs:
49131
- go.mod
@@ -57,6 +139,7 @@ packages:
57139
env:
58140
- CGO_ENABLED=0
59141
- GOOS=windows
142+
- GOARCH=arm64
60143
prep:
61144
- ["cp", "_deps/components-local-app--version/version.txt", "version.txt"]
62145
config:

‎components/local-app/leeway.Dockerfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@
55
FROM alpine:3.14
66

77
WORKDIR /app
8-
COPY components-local-app--app/components-local-app--app-linux/local-app local-app-linux
9-
COPY components-local-app--app/components-local-app--app-darwin/local-app local-app-darwin
10-
COPY components-local-app--app/components-local-app--app-windows/local-app.exe local-app-windows.exe
8+
COPY components-local-app--app/components-local-app--app-linux-amd64/local-app local-app-linux
9+
COPY components-local-app--app/components-local-app--app-darwin-amd64/local-app local-app-darwin
10+
COPY components-local-app--app/components-local-app--app-windows-amd64/local-app.exe local-app-windows.exe
11+
12+
COPY components-local-app--app/components-local-app--app-linux-amd64/local-app local-app-linux-amd64
13+
COPY components-local-app--app/components-local-app--app-darwin-amd64/local-app local-app-darwin-amd64
14+
COPY components-local-app--app/components-local-app--app-windows-amd64/local-app.exe local-app-windows-amd64.exe
15+
16+
COPY components-local-app--app/components-local-app--app-linux-arm64/local-app local-app-linux-arm64
17+
COPY components-local-app--app/components-local-app--app-darwin-arm64/local-app local-app-darwin-arm64
18+
COPY components-local-app--app/components-local-app--app-windows-arm64/local-app.exe local-app-windows-arm64.exe
19+
COPY components-local-app--app/components-local-app--app-windows-386/local-app.exe local-app-windows-386.exe
1120

1221
CMD ["/bin/sh", "-c", "cp /app/* /out"]

‎components/local-app/pkg/auth/auth_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Licensed under the GNU Affero General Public License (AGPL).
33
// See License-AGPL.txt in the project root for license information.
44

5-
//go:build linux
6-
// +build linux
5+
//go:build linux && amd64
6+
// +build linux,amd64
77

88
package auth
99

0 commit comments

Comments
 (0)