Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update-db #1207

Merged
merged 4 commits into from
Apr 1, 2021
Merged

update-db #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae843c3
update db
yehiyam Apr 1, 2021
04cb7f3
update db
yehiyam Apr 1, 2021
9272a23
Merge branch 'master' into update-db
yehiyam Apr 1, 2021
920ce8d
update db
yehiyam Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/algorithm-builder/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/algorithm-builder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dependencies": {
"@hkube/config": "^2.0.11",
"@hkube/consts": "^1.0.31",
"@hkube/db": "^1.0.28",
"@hkube/db": "^1.0.30",
"@hkube/etcd": "^5.1.2",
"@hkube/kubernetes-client": "^1.0.33",
"@hkube/logger": "^1.0.27",
Expand Down
6 changes: 3 additions & 3 deletions core/algorithm-operator/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/algorithm-operator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@hkube/config": "^2.0.11",
"@hkube/consts": "^1.0.31",
"@hkube/db": "^1.0.28",
"@hkube/db": "^1.0.30",
"@hkube/healthchecks": "^1.0.1",
"@hkube/kubernetes-client": "^1.0.33",
"@hkube/logger": "^1.0.27",
Expand Down
6 changes: 3 additions & 3 deletions core/algorithm-queue/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/algorithm-queue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@hkube/config": "^2.0.11",
"@hkube/consts": "^1.0.31",
"@hkube/db": "^1.0.28",
"@hkube/db": "^1.0.30",
"@hkube/etcd": "^5.1.2",
"@hkube/logger": "^1.0.27",
"@hkube/metrics": "^1.0.42",
Expand Down
2 changes: 2 additions & 0 deletions core/api-server/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
.git
9 changes: 8 additions & 1 deletion core/api-server/dockerfile/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
ARG BASE_PRIVATE_REGISTRY=""
FROM ${BASE_PRIVATE_REGISTRY}node:14.5.0 as install
ADD ./package-lock.json ./package.json /hkube/api-server/
WORKDIR /hkube/api-server
RUN npm ci --production


ARG BASE_PRIVATE_REGISTRY=""
FROM ${BASE_PRIVATE_REGISTRY}hkube/base-node:v1.2.0
LABEL maintainer="yehiyam@gmail.com"
RUN mkdir /hkube
COPY . /hkube/api-server
RUN cd /hkube/api-server
COPY --from=install /hkube/api-server/node_modules /hkube/api-server/node_modules
WORKDIR /hkube/api-server
CMD ["node", "app.js"]
8 changes: 0 additions & 8 deletions core/api-server/dockerfile/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,10 @@ then
BASE_PRIVATE_REGISTRY="${BASE_PRIVATE_REGISTRY}/"
fi
docker build -t ${TAG_VER} --build-arg BASE_PRIVATE_REGISTRY="${BASE_PRIVATE_REGISTRY}" -f ./dockerfile/Dockerfile .
if [ "${TRAVIS_PULL_REQUEST:-"false"}" == "false" ] || [ -z "${TRAVIS_PULL_REQUEST}" ]; then
TAG_CUR="${IMAGE_NAME}:latest"
docker tag ${TAG_VER} "${TAG_CUR}"
fi

if [ -v PRIVATE_REGISTRY ]
then
echo docker push ${TAG_VER}
docker push ${TAG_VER}
if [[ -v TAG_CUR ]]; then
echo docker push ${TAG_CUR}
docker push ${TAG_CUR}
fi
fi

Loading