Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
github
orchestrator
提交
23a89909
O
orchestrator
项目概览
github
/
orchestrator
9 个月 前同步成功
通知
18
Star
5143
Fork
916
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
orchestrator
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
23a89909
编写于
7月 27, 2021
作者:
S
Shlomi Noach
提交者:
GitHub
7月 27, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1391 from openark/go116
Build/CI: using golang 1.16
上级
1b9ee806
85cdd58b
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
16 addition
and
16 deletion
+16
-16
.github/workflows/main.yml
.github/workflows/main.yml
+2
-2
.github/workflows/system.yml
.github/workflows/system.yml
+2
-2
.github/workflows/upgrade.yml
.github/workflows/upgrade.yml
+2
-2
build.sh
build.sh
+2
-2
docker/Dockerfile
docker/Dockerfile
+2
-2
docker/Dockerfile.packaging
docker/Dockerfile.packaging
+1
-1
docker/Dockerfile.raft
docker/Dockerfile.raft
+1
-1
docker/Dockerfile.system
docker/Dockerfile.system
+1
-1
docker/Dockerfile.test
docker/Dockerfile.test
+1
-1
script/ensure-go-installed
script/ensure-go-installed
+2
-2
未找到文件。
.github/workflows/main.yml
浏览文件 @
23a89909
...
...
@@ -15,10 +15,10 @@ jobs:
steps
:
-
uses
:
actions/checkout@v2
-
name
:
Set up Go
1.1
4
-
name
:
Set up Go
1.1
6
uses
:
actions/setup-go@v1
with
:
go-version
:
1.1
4
go-version
:
1.1
6
-
name
:
Test source code
run
:
script/test-source
...
...
.github/workflows/system.yml
浏览文件 @
23a89909
...
...
@@ -12,10 +12,10 @@ jobs:
runs-on
:
ubuntu-latest
steps
:
-
name
:
Set up Go
1.1
4
-
name
:
Set up Go
1.1
6
uses
:
actions/setup-go@v1
with
:
go-version
:
1.1
4
go-version
:
1.1
6
-
name
:
check out
uses
:
actions/checkout@v2
...
...
.github/workflows/upgrade.yml
浏览文件 @
23a89909
...
...
@@ -11,10 +11,10 @@ jobs:
# backend: [sqlite, MySQL]
steps
:
-
name
:
Set up Go
1.1
4
-
name
:
Set up Go
1.1
6
uses
:
actions/setup-go@v1
with
:
go-version
:
1.1
4
go-version
:
1.1
6
-
name
:
Start local MySQL
run
:
sudo /etc/init.d/mysql start
...
...
build.sh
浏览文件 @
23a89909
...
...
@@ -84,8 +84,8 @@ function precheck() {
ok
=
1
fi
if
!
go version | egrep
-q
'go(1\.1[
456
])'
;
then
echo
"go version must be 1.1
4
or above"
if
!
go version | egrep
-q
'go(1\.1[
6789
])'
;
then
echo
"go version must be 1.1
6
or above"
ok
=
1
fi
...
...
docker/Dockerfile
浏览文件 @
23a89909
...
...
@@ -14,7 +14,7 @@
# ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
# ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
FROM
golang:1.1
4.4-alpine3.12
as build
FROM
golang:1.1
6.6-alpine3.14
as build
ENV
GOPATH=/tmp/go
...
...
@@ -28,7 +28,7 @@ RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator -maxde
RUN
rsync
-av
$(
find /tmp/orchestrator-release
-type
d
-name
orchestrator-client
-maxdepth
2
)
/ /
RUN
cp
conf/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json
FROM
alpine:3.
8
FROM
alpine:3.
14
RUN
apk
--no-cache
add bash curl jq
...
...
docker/Dockerfile.packaging
浏览文件 @
23a89909
...
...
@@ -14,7 +14,7 @@
# ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
# ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
FROM golang:1.1
4.4
-stretch
FROM golang:1.1
6.6
-stretch
RUN apt-get update
RUN apt-get install -y ruby ruby-dev rubygems build-essential
...
...
docker/Dockerfile.raft
浏览文件 @
23a89909
FROM golang:1.1
4.4
-stretch
FROM golang:1.1
6.6
-stretch
LABEL maintainer="openark@github.com"
RUN apt-get update -q -y
...
...
docker/Dockerfile.system
浏览文件 @
23a89909
FROM golang:1.1
4.4
-stretch
FROM golang:1.1
6.6
-stretch
LABEL maintainer="openark@github.com"
RUN apt-get update -q -y
...
...
docker/Dockerfile.test
浏览文件 @
23a89909
FROM
golang
:
1.1
4.4
-
stretch
FROM
golang
:
1.1
6.6
-
stretch
LABEL
maintainer
=
"openark@github.com"
RUN
apt
-
get
update
...
...
script/ensure-go-installed
浏览文件 @
23a89909
#!/bin/bash
PREFERRED_GO_VERSION
=
go1.1
4.4
SUPPORTED_GO_VERSIONS
=
'go1.1[
456
]'
PREFERRED_GO_VERSION
=
go1.1
6.6
SUPPORTED_GO_VERSIONS
=
'go1.1[
6789
]'
export
ROOTDIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
/.."
&&
pwd
)
"
cd
$ROOTDIR
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录