Skip to content

Commit

Permalink
fix github action build
Browse files Browse the repository at this point in the history
Signed-off-by: chengdehao <[email protected]>
  • Loading branch information
wenchajun committed Jun 14, 2022
1 parent 2d2e832 commit 34f4b2f
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-fb-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x

- uses: actions/cache@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-fd-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x

- uses: actions/cache@v2
with:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x

- uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-op-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x

- uses: actions/cache@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x

- uses: actions/cache@v2
with:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x

- uses: actions/cache@v2
with:
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x

- uses: actions/cache@v2
with:
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x
go-version: 1.17.x

- uses: actions/cache@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions cmd/fluent-watcher/fluentd/Dockerfile.amd64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Fluentd watcher agent
FROM golang:1.17.10-alpine3.16 as buildergo
FROM golang:1.17-alpine3.13 as buildergo
RUN mkdir -p /fluentd
RUN mkdir -p /code
COPY . /code/
Expand All @@ -8,7 +8,7 @@ RUN echo $(ls -al /code)
RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go

# Fluentd main image
FROM alpine:3.16
FROM alpine:3.13
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.14.6"

# Do not split this into multiple RUN!
Expand Down
2 changes: 1 addition & 1 deletion cmd/fluent-watcher/fluentd/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Fluentd watcher agent
FROM golang:1.17.10-alpine3.16 as buildergo
FROM golang:1.17-alpine3.13 as buildergo
RUN mkdir -p /fluentd
RUN mkdir -p /code
COPY . /code/
Expand Down
2 changes: 1 addition & 1 deletion cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Fluentd watcher agent
FROM golang:1.17.10-alpine3.16 as buildergo
FROM golang:1.17-alpine3.13 as buildergo
RUN mkdir -p /fluentd
RUN mkdir -p /code
COPY . /code/
Expand Down

0 comments on commit 34f4b2f

Please sign in to comment.