Fix travis
This commit is contained in:
parent
258770a877
commit
4494b662a1
|
|
@ -24,8 +24,7 @@ jobs:
|
|||
- stage: pvc_e2e
|
||||
name: "Backup PVC - e2e"
|
||||
script:
|
||||
- travis_wait 10 chmod -R 777 backup/pvc/e2e
|
||||
- travis_wait 10 make -C backup/pvc/ docker-e2e
|
||||
- travis_wait 10 make -C backup/pvc/ docker-e2e UID=$(id -u) GID=$(id -g)
|
||||
- stage: e2e
|
||||
name: "Jenkins Operator - e2e"
|
||||
script:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
FROM debian:buster-slim
|
||||
|
||||
ARG UID
|
||||
ARG GID
|
||||
|
||||
ENV USER=user
|
||||
ENV UID=1000
|
||||
ENV GID=1000
|
||||
|
||||
RUN addgroup --gid "$GID" "$USER" && \
|
||||
adduser \
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ docker-login: ## Log in into the Docker repository
|
|||
.PHONY: docker-build
|
||||
docker-build: check-env ## Build the container
|
||||
@echo "+ $@"
|
||||
docker build . -t $(DOCKER_REGISTRY)-$(NAME):$(GITCOMMIT) --file Dockerfile
|
||||
docker build . --build-arg UID=$(UID) --build-arg GID=$(GID) -t $(DOCKER_REGISTRY)-$(NAME):$(GITCOMMIT) --file Dockerfile
|
||||
|
||||
.PHONY: docker-images
|
||||
docker-images: ## List all local containers
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
# Setup variables for the Makefile
|
||||
NAME=pvc
|
||||
DOCKER_ORGANIZATION=virtuslab
|
||||
DOCKER_REGISTRY=jenkins-operator-backup
|
||||
DOCKER_REGISTRY=jenkins-operator-backup
|
||||
UID=1000
|
||||
GID=1000
|
||||
Loading…
Reference in New Issue