infrastructure/k8s-csi-s3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fix Makefile and Dockerfiles

Browse source
This commit is contained in:
Cyrill Troxler 2021-04-06 20:52:15 +02:00
parent 5a53429207
commit 9a835675ec
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -24,11 +24,12 @@ TEST_IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):test
build: build:
CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o _output/s3driver ./cmd/s3driver CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o _output/s3driver ./cmd/s3driver
test: test:
docker build -t $(FULL_IMAGE_TAG) -f cmd/s3driver/Dockerfile.full .
docker build -t $(TEST_IMAGE_TAG) -f test/Dockerfile . docker build -t $(TEST_IMAGE_TAG) -f test/Dockerfile .
docker run --rm --privileged -v $(PWD):$(PROJECT_DIR) --device /dev/fuse $(TEST_IMAGE_TAG) docker run --rm --privileged -v $(PWD):$(PROJECT_DIR) --device /dev/fuse $(TEST_IMAGE_TAG)
container: build container:
docker build -t $(IMAGE_TAG) -f cmd/s3driver/Dockerfile . docker build -t $(IMAGE_TAG) -f cmd/s3driver/Dockerfile .
docker build -t $(FULL_IMAGE_TAG) --build-arg VERSION=$(VERSION) -f cmd/s3driver/Dockerfile.full . docker build -t $(FULL_IMAGE_TAG) -f cmd/s3driver/Dockerfile.full .
push: container push: container
docker push $(IMAGE_TAG) docker push $(IMAGE_TAG)
docker push $(FULL_IMAGE_TAG) docker push $(FULL_IMAGE_TAG)

2
cmd/s3driver/Dockerfile.full
View file

@ -41,7 +41,7 @@ COPY --from=s3backer /usr/bin/s3backer /usr/bin/s3backer
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
libfuse2 gcc sqlite3 libsqlite3-dev \ libfuse2 gcc sqlite3 libsqlite3-dev \
s3fs psmisc procps libcurl3 xfsprogs curl unzip && \ s3fs psmisc procps libcurl4 xfsprogs curl unzip && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# install rclone # install rclone

7
test/Dockerfile
View file

@ -7,9 +7,10 @@ RUN apt-get update && \
git wget make && \ git wget make && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN wget -q https://golang.org/dl/go1.15.7.linux-amd64.tar.gz && \ ARG GOVERSION=1.16.3
tar -xf go1.15.7.linux-amd64.tar.gz && \ RUN wget -q https://golang.org/dl/go${GOVERSION}.linux-amd64.tar.gz && \
rm go1.15.7.linux-amd64.tar.gz && \ tar -xf go${GOVERSION}.linux-amd64.tar.gz && \
rm go${GOVERSION}.linux-amd64.tar.gz && \
mv go /usr/local mv go /usr/local
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go