Skip to content

Commit e5e5e08

Browse files
authored
Merge pull request #23 from chuntaojun/fix_auto_docker
fix: 修复自动Docker镜像构建问题
2 parents 9b3b615 + a338c99 commit e5e5e08

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

.github/workflows/docker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
goos: [linux]
1414
goarch: [amd64]
1515
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v2
18+
1619
- name: Set up Go
1720
uses: actions/setup-go@v2
1821
with:

.github/workflows/package.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
steps:
2121
- name: Checkout code
2222
uses: actions/checkout@v2
23-
with:
24-
go-version: 1.16.5
2523

2624
- name: Get version
2725
id: get_version

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
steps:
2222
- name: Checkout code
2323
uses: actions/checkout@v2
24-
with:
25-
go-version: 1.16.5
2624

2725
- name: Get version
2826
id: get_version

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ WORKDIR /data
1212
RUN chmod -R a+rw /data
1313

1414
COPY polaris-sidecar /data/polaris-sidecar
15+
16+
RUN chmod +x /data/polaris-sidecar

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ build_date=$(date "+%Y%m%d.%H%M%S")
4141
package="github.com/polarismesh/polaris-sidecar/version"
4242
go build -o ${bin_name} -ldflags="-X ${package}.Version=${version} -X ${package}.BuildDate=${build_date}"
4343

44+
# 设置程序为可执行
4445
chmod +x ${bin_name}
4546

4647
# 打包

build_docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
if [ $# != 3 ]; then
4-
echo "e.g.: bash $0 v1.0 docker_username docekr_user_password"
3+
if [ $# != 1 ]; then
4+
echo "e.g.: bash $0 v1.0"
55
exit 1
66
fi
77

0 commit comments

Comments
 (0)