Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfe1bdc9

Browse files
authored
Refactored Gaia parameters (#198)
* Refactored gaia parameters* Fixed small issue with the help command* Fixed env variables
1 parent2382c79 commitfe1bdc9

File tree

12 files changed

+60
-69
lines changed

12 files changed

+60
-69
lines changed

‎.circleci/images/primary/Dockerfile‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
FROM python:2.7-stretch
22

3-
# Version and other variables which can be changed.
4-
ENV GAIA_PORT=8080 \
5-
GAIA_WORKER=2 \
6-
GAIA_HOMEPATH=/data
7-
83
# CircleCI required tools
94
RUN apt-get update && apt-get install -y --no-install-recommends \
105
git \
@@ -24,20 +19,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2419
pkg-config \
2520
&& rm -rf /var/lib/apt/lists/*
2621

27-
ENV GOLANG_VERSION 1.12.5
22+
ENV GOLANG_VERSION 1.12.7
2823

2924
RUN set -eux; \
3025
\
3126
# this "case" statement is generated via "update.sh"
3227
dpkgArch="$(dpkg --print-architecture)"; \
3328
case"${dpkgArch##*-}" in \
34-
amd64) goRelArch='linux-amd64'; goRelSha256='aea86e3c73495f205929cfebba0d63f1382c8ac59be081b6351681415f4063cf' ;; \
35-
armhf) goRelArch='linux-armv6l'; goRelSha256='311f5e76c7cec1ec752474a61d837e474b8e750b8e3eed267911ab57c0e5da9a' ;; \
36-
arm64) goRelArch='linux-arm64'; goRelSha256='ff09f34935cd189a4912f3f308ec83e4683c309304144eae9cf60ebc552e7cd8' ;; \
37-
i386) goRelArch='linux-386'; goRelSha256='146605e13bf337ff3aacd941a816c5d97a8fef8b5817e07fcec4540632085980' ;; \
38-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='e88b2a2098bc79ad33912d1d27bc3282a7f3231b6f4672f306465bf46ff784ca' ;; \
39-
s390x) goRelArch='linux-s390x'; goRelSha256='168d297ec910cb446d1aea878baeb85f1387209f9eb55dde68bddcd4c006dcbb' ;; \
40-
*) goRelArch='src'; goRelSha256='2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8'; \
29+
amd64) goRelArch='linux-amd64'; goRelSha256='66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9' ;; \
30+
armhf) goRelArch='linux-armv6l'; goRelSha256='48edbe936e9eb74f259bfc4b621fafca4d4ec43156b4ee7bd0d979f257dcd60a' ;; \
31+
arm64) goRelArch='linux-arm64'; goRelSha256='4da1f7198a8fa0c4067852656b6c10153a4eca5a26aca28ef02ae9f4a7939ba5' ;; \
32+
i386) goRelArch='linux-386'; goRelSha256='ae2424b7ff557a708be12d3141f25b645966489ca49af1ad10b4fbe4c97d4c41' ;; \
33+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='8eda20600d90247efbfa70d116d80056e11192d62592240975b2a8c53caa5bf3' ;; \
34+
s390x) goRelArch='linux-s390x'; goRelSha256='3374ac3d646555e50be790091b51849319cfcb176904048458c7f4252337fce8' ;; \
35+
*) goRelArch='src'; goRelSha256='95e8447d6f04b8d6a62de1726defbb20ab203208ee167ed15f83d7978ce43b13'; \
4136
echo >&2; echo >&2"warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
4237
esac; \
4338
\

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TEST_TIMEOUT?=20s
1010
default: dev
1111

1212
dev:
13-
go run ./cmd/gaia/main.go -homepath=${PWD}/tmp -dev=true
13+
go run ./cmd/gaia/main.go -home-path=${PWD}/tmp -dev=true
1414

1515
compile_frontend:
1616
cd ./frontend&&\
@@ -52,4 +52,4 @@ kube-ingress-lb:
5252
kubectl apply -R -f${HELM_DIR}/_system
5353

5454
lint:
55-
golint -set_exit_status ./...
55+
golint -set_exit_status ./...

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Manually
8080
It is possible to install Gaia directly on the host system.
8181
This can be achieved by downloading the binary from the `releases page`_.
8282

83-
Gaia will automatically detect the folder of the binary and will place all data next to it. You can change the data directory with the startup parameter *--homepath* if you want.
83+
Gaia will automatically detect the folder of the binary and will place all data next to it. You can change the data directory with the startup parameter *-home-path* if you want.
8484

8585
Using helm
8686
~~~~~~~~~~

‎docker/Dockerfile‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
FROM python:2.7-stretch
22

3-
#Version and othervariables which can be changed.
3+
#Set envvariables
44
ENV GAIA_PORT=8080 \
5-
GAIA_WORKER=2 \
6-
GAIA_HOMEPATH=/data
5+
GAIA_HOME_PATH=/data
76

87
# --------------- Start Go Part ---------------
98
# gcc for cgo
@@ -15,20 +14,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1514
pkg-config \
1615
&& rm -rf /var/lib/apt/lists/*
1716

18-
ENV GOLANG_VERSION 1.11.4
17+
ENV GOLANG_VERSION 1.12.7
1918

2019
RUN set -eux; \
2120
\
2221
# this "case" statement is generated via "update.sh"
2322
dpkgArch="$(dpkg --print-architecture)"; \
2423
case"${dpkgArch##*-}" in \
25-
amd64) goRelArch='linux-amd64'; goRelSha256='fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b' ;; \
26-
armhf) goRelArch='linux-armv6l'; goRelSha256='9f7a71d27fef69f654a93e265560c8d9db1a2ca3f1dcdbe5288c46facfde5821' ;; \
27-
arm64) goRelArch='linux-arm64'; goRelSha256='b76df430ba8caff197b8558921deef782cdb20b62fa36fa93f81a8c08ab7c8e7' ;; \
28-
i386) goRelArch='linux-386'; goRelSha256='cecd2da1849043237d5f0756a93d601db6798fa3bb27a14563d201088aa415f3' ;; \
29-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='1f10146826acd56716b00b9188079af53823ddd79ceb6362e78e2f3aafb370ab' ;; \
30-
s390x) goRelArch='linux-s390x'; goRelSha256='4467442dacf89eb94c5d6f9f700204cb360be82db60e6296cc2ef8d0e890cd42' ;; \
31-
*) goRelArch='src'; goRelSha256='4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15'; \
24+
amd64) goRelArch='linux-amd64'; goRelSha256='66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9' ;; \
25+
armhf) goRelArch='linux-armv6l'; goRelSha256='48edbe936e9eb74f259bfc4b621fafca4d4ec43156b4ee7bd0d979f257dcd60a' ;; \
26+
arm64) goRelArch='linux-arm64'; goRelSha256='4da1f7198a8fa0c4067852656b6c10153a4eca5a26aca28ef02ae9f4a7939ba5' ;; \
27+
i386) goRelArch='linux-386'; goRelSha256='ae2424b7ff557a708be12d3141f25b645966489ca49af1ad10b4fbe4c97d4c41' ;; \
28+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='8eda20600d90247efbfa70d116d80056e11192d62592240975b2a8c53caa5bf3' ;; \
29+
s390x) goRelArch='linux-s390x'; goRelSha256='3374ac3d646555e50be790091b51849319cfcb176904048458c7f4252337fce8' ;; \
30+
*) goRelArch='src'; goRelSha256='95e8447d6f04b8d6a62de1726defbb20ab203208ee167ed15f83d7978ce43b13'; \
3231
echo >&2; echo >&2"warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
3332
esac; \
3433
\
@@ -307,7 +306,7 @@ RUN chmod +x ./gaia-linux-amd64 \
307306
&& chmod 600 /root/.ssh
308307

309308
# Set homepath as volume
310-
VOLUME ["${GAIA_HOMEPATH}" ]
309+
VOLUME ["${GAIA_HOME_PATH}" ]
311310

312311
# Expose port
313312
EXPOSE ${GAIA_PORT}

‎docker/Dockerfile.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y \
55
automake libtool curl make g++ unzip \
66
&& apt-get clean
77

8-
# install protobuf first, then grpc
9-
ENV GRPC_RELEASE_TAG v1.16.x
8+
# install protobuf first, then grpc
9+
ENV GRPC_RELEASE_TAG v1.16.x
1010
RUN git clone -b ${GRPC_RELEASE_TAG} https://github.com/grpc/grpc /var/local/git/grpc && \
1111
cd /var/local/git/grpc && \
1212
git submodule update --init && \
@@ -20,7 +20,7 @@ RUN git clone -b ${GRPC_RELEASE_TAG} https://github.com/grpc/grpc /var/local/git
2020

2121
# Gaia internal portand data path.
2222
ENV GAIA_PORT=8080 \
23-
GAIA_HOMEPATH=/data
23+
GAIA_HOME_PATH=/data
2424

2525
# Directoryfor the binary
2626
WORKDIR /app
@@ -35,7 +35,7 @@ RUN chmod +x ./gaia-linux-amd64 \
3535
&& chmod600 /root/.ssh
3636

3737
# Set homepath as volume
38-
VOLUME ["${GAIA_HOMEPATH}" ]
38+
VOLUME ["${GAIA_HOME_PATH}" ]
3939

4040
# Expose port
4141
EXPOSE ${GAIA_PORT}

‎docker/Dockerfile.golang‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
FROM golang:1.11.4-alpine3.8
1+
FROM golang:1.12.7-alpine3.8
22

33
# Version and other variables which can be changed.
44
ENV GAIA_PORT=8080 \
5-
GAIA_WORKER=2 \
6-
GAIA_HOMEPATH=/data
5+
GAIA_HOME_PATH=/data
76

87
# Directory for the binary
98
WORKDIR /app
@@ -20,7 +19,7 @@ RUN chmod +x ./gaia-linux-amd64 \
2019
&& chmod 600 /root/.ssh
2120

2221
# Set homepath as volume
23-
VOLUME [ "${GAIA_HOMEPATH}" ]
22+
VOLUME [ "${GAIA_HOME_PATH}" ]
2423

2524
# Expose port
2625
EXPOSE ${GAIA_PORT}

‎docker/Dockerfile.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
#Versionandothervariableswhichcanbechanged.
44
ENVGAIA_PORT=8080 \
5-
GAIA_WORKER=2 \
6-
GAIA_HOMEPATH=/data
5+
GAIA_HOME_PATH=/data
76

87
#Directoryforthebinary
98
WORKDIR /app
@@ -18,7 +17,7 @@
1817
&&chmod600 /root/.ssh
1918

2019
#Sethomepathasvolume
21-
VOLUME ["${GAIA_HOMEPATH}" ]
20+
VOLUME ["${GAIA_HOME_PATH}" ]
2221

2322
#Exposeport
2423
EXPOSE${GAIA_PORT}

‎docker/Dockerfile.nodejs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ FROM node:11.15.0-stretch
22

33
# Version and other variables which can be changed.
44
ENV GAIA_PORT=8080 \
5-
GAIA_WORKER=2 \
6-
GAIA_HOMEPATH=/data
5+
GAIA_HOME_PATH=/data
76

87
# Directory for the binary
98
WORKDIR /app
@@ -18,7 +17,7 @@ RUN chmod +x ./gaia-linux-amd64 \
1817
&& chmod 600 /root/.ssh
1918

2019
# Set homepath as volume
21-
VOLUME [ "${GAIA_HOMEPATH}" ]
20+
VOLUME [ "${GAIA_HOME_PATH}" ]
2221

2322
# Expose port
2423
EXPOSE ${GAIA_PORT}

‎docker/Dockerfile.python‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ FROM python:2.7-alpine3.8
22

33
# Version and other variables which can be changed.
44
ENV GAIA_PORT=8080 \
5-
GAIA_WORKER=2 \
6-
GAIA_HOMEPATH=/data
5+
GAIA_HOME_PATH=/data
76

87
# install additional deps
98
RUN set -ex; \
@@ -23,7 +22,7 @@ RUN chmod +x ./gaia-linux-amd64 \
2322
&& chmod 600 /root/.ssh
2423

2524
# Set homepath as volume
26-
VOLUME [ "${GAIA_HOMEPATH}" ]
25+
VOLUME [ "${GAIA_HOME_PATH}" ]
2726

2827
# Expose port
2928
EXPOSE ${GAIA_PORT}

‎docker/Dockerfile.ruby‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ FROM ruby:2.5.3-stretch
22

33
# Version and other variables which can be changed.
44
ENVGAIA_PORT=8080 \
5-
GAIA_WORKER=2 \
6-
GAIA_HOMEPATH=/data
5+
GAIA_HOME_PATH=/data
76
87
# Directory for the binary
98
WORKDIR /app
@@ -18,7 +17,7 @@ RUN chmod +x ./gaia-linux-amd64 \
1817
&&chmod600/root/.ssh
1918

2019
# Set homepath as volume
21-
VOLUME["${GAIA_HOMEPATH}"]
20+
VOLUME["${GAIA_HOME_PATH}"]
2221

2322
# Expose port
2423
EXPOSE ${GAIA_PORT}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp