balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-22 00:02:28 +00:00
Code Issues Releases Wiki Activity

Fixed image repository

Browse Source
This commit is contained in:
J. Fernando Sánchez 2017-05-19 19:59:45 +02:00
parent 236183593c
commit 0f8d1dff69
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -13,7 +13,7 @@ GITHUB_REPO=git@github.com:gsi-upm/senpy.git
KUBE_CA_PEM_FILE="" KUBE_CA_PEM_FILE=""
KUBE_URL="" KUBE_URL=""
KUBE_TOKEN="" KUBE_TOKEN=""
KUBE_NS=$(NAME) KUBE_NAMESPACE=$(NAME)
KUBECTL=docker run --rm -v $(KUBE_CA_PEM_FILE):/tmp/ca.pem -v $$PWD:/tmp/cwd/ -i lachlanevenson/k8s-kubectl --server="$(KUBE_URL)" --token="$(KUBE_TOKEN)" --certificate-authority="/tmp/ca.pem" -n $(KUBE_NAMESPACE) KUBECTL=docker run --rm -v $(KUBE_CA_PEM_FILE):/tmp/ca.pem -v $$PWD:/tmp/cwd/ -i lachlanevenson/k8s-kubectl --server="$(KUBE_URL)" --token="$(KUBE_TOKEN)" --certificate-authority="/tmp/ca.pem" -n $(KUBE_NAMESPACE)
CI_REGISTRY=docker.io CI_REGISTRY=docker.io
CI_REGISTRY_USER=gitlab CI_REGISTRY_USER=gitlab
@ -136,8 +136,8 @@ ci:
gitlab-runner exec docker --docker-volumes /var/run/docker.sock:/var/run/docker.sock --env CI_PROJECT_NAME=$(NAME) ${action} gitlab-runner exec docker --docker-volumes /var/run/docker.sock:/var/run/docker.sock --env CI_PROJECT_NAME=$(NAME) ${action}
deploy: deploy:
@$(KUBECTL) delete -n $(KUBE_NS) secret $(CI_REGISTRY) || true @$(KUBECTL) delete secret $(CI_REGISTRY) || true
@$(KUBECTL) create -n $(NAME) secret docker-registry $(CI_REGISTRY) --docker-server=$(CI_REGISTRY) --docker-username=$(CI_REGISTRY_USER) --docker-email=$(CI_REGISTRY_USER) --docker-password=$(CI_BUILD_TOKEN) @$(KUBECTL) create secret docker-registry $(CI_REGISTRY) --docker-server=$(CI_REGISTRY) --docker-username=$(CI_REGISTRY_USER) --docker-email=$(CI_REGISTRY_USER) --docker-password=$(CI_BUILD_TOKEN)
@$(KUBECTL) apply -f /tmp/cwd/k8s/ @$(KUBECTL) apply -f /tmp/cwd/k8s/

2
k8s/senpy-deployment.yaml
View File

@ -12,7 +12,7 @@ spec:
spec: spec:
containers: containers:
- name: senpy-latest - name: senpy-latest
image: gsiupm/senpy:latest image: registry.cluster.gsi.dit.upm.es/senpy/senpy:latest
args: args:
- "--default-plugins" - "--default-plugins"
resources: resources: