Skip to content

fix image tag #6

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

Merged
yuji-watanabe-jp merged 1 commit into from
Jun 29, 2020
Merged

fix image tag #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions develop/scripts/build_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ if [ -z "$IE_REPO_ROOT" ]; then
fi

SERVICE_NAME=ie-server
IMAGE_REMOTE=integrityenforcer/ie-server:latest
IMAGE_REMOTE=integrityenforcer/ie-server:0.0.1
IMAGE_LOCAL=ie-server:local
BASEDIR=./deployment
DOCKERFILE=./image/Dockerfile

LOGG_BASEDIR=${IE_REPO_ROOT}/logging/
LOGG_IMAGE_REMOTE=integrityenforcer/ie-logging:latest
LOGG_IMAGE_REMOTE=integrityenforcer/ie-logging:0.0.1
LOGG_IMAGE_LOCAL=ie-logging:local

OPERATOR_BASEDIR=${IE_REPO_ROOT}/operator/
Expand Down
4 changes: 2 additions & 2 deletions develop/scripts/push_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ if [ -z "$IE_REPO_ROOT" ]; then
fi

SERVICE_NAME=ie-server
IMAGE_REMOTE=integrityenforcer/ie-server:latest
IMAGE_REMOTE=integrityenforcer/ie-server:0.0.1
IMAGE_LOCAL=ie-server:local
BASEDIR=./deployment
DOCKERFILE=./image/Dockerfile

LOGG_BASEDIR=${IE_REPO_ROOT}/logging/
LOGG_IMAGE_REMOTE=integrityenforcer/ie-logging:latest
LOGG_IMAGE_REMOTE=integrityenforcer/ie-logging:0.0.1
LOGG_IMAGE_LOCAL=ie-logging:local

OPERATOR_BASEDIR=${IE_REPO_ROOT}/operator/
Expand Down
2 changes: 1 addition & 1 deletion develop/signservice/develop/scripts/build_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if [ -z "$IE_REPO_ROOT" ]; then
fi

SS_BASEDIR=${IE_REPO_ROOT}/develop/signservice/signservice/
SS_IMAGE_REMOTE=integrityenforcer/ie-signservice:latest
SS_IMAGE_REMOTE=integrityenforcer/ie-signservice:0.0.1
SS_IMAGE_LOCAL=signservice:dev

SS_OPERATOR_BASEDIR=${IE_REPO_ROOT}/develop/signservice/signservice-operator/
Expand Down
2 changes: 1 addition & 1 deletion develop/signservice/develop/scripts/push_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi


SS_BASEDIR=${IE_REPO_ROOT}/develop/signservice/signservice/
SS_IMAGE_REMOTE=integrityenforcer/ie-signservice:latest
SS_IMAGE_REMOTE=integrityenforcer/ie-signservice:0.0.1
SS_IMAGE_LOCAL=signservice:dev

SS_OPERATOR_BASEDIR=${IE_REPO_ROOT}/develop/signservice/signservice-operator/
Expand Down
2 changes: 1 addition & 1 deletion ...ignservice/signservice-operator/deploy/crds/research.ibm.com_v1alpha1_signservice_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
invalidSigners:
- [email protected]
signService:
image: integrityenforcer/ie-signservice:latest
image: integrityenforcer/ie-signservice:0.0.1
imagePullPolicy: Always
port: 8180
resources:
Expand Down
6 changes: 3 additions & 3 deletions enforcer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@

REPO_ROOT=./..
SERVICE_NAME ?=ie-server
IMAGE_REMOTE ?=integrityenforcer/ie-server:latest
IMAGE_REMOTE ?=integrityenforcer/ie-server:0.0.1
IMAGE_LOCAL ?=ie-server:local
KEYDIR ?= ./cert
BASEDIR ?= ./deployment
IE_NS ?= ienforcer
DOCKERFILE ?= ./image/Dockerfile

LOGG_BASEDIR ?=$(REPO_ROOT)/logging/
LOGG_IMAGE_REMOTE ?=integrityenforcer/ie-logging:latest
LOGG_IMAGE_REMOTE ?=integrityenforcer/ie-logging:0.0.1
LOGG_IMAGE_LOCAL ?=ie-logging:local

SS_BASEDIR ?=$(REPO_ROOT)/signservice/
SS_IMAGE_REMOTE ?=integrityenforcer/ie-signservice:latest
SS_IMAGE_REMOTE ?=integrityenforcer/ie-signservice:0.0.1
SS_IMAGE_LOCAL ?=signservice:dev

CA ?=$(shell openssl base64 -A <'$(KEYDIR)/ca.crt')
Expand Down
4 changes: 2 additions & 2 deletions operator/deploy/crds/research.ibm.com_v1alpha1_integrityenforcer_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
port: 9200
scheme: http
esSecretName: es-tls-certs
image: integrityenforcer/ie-logging:latest
image: integrityenforcer/ie-logging:0.0.1
imagePullPolicy: Always
name: forwarder
resources:
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
chartBaseUrl: http://sample-chart-repo-server/charts
contextLogEnabled: true
enforcePolicyReloadSec: 10
image: integrityenforcer/ie-server:latest
image: integrityenforcer/ie-server:0.0.1
imagePullPolicy: Always
name: server
port: 8443
Expand Down