Merge branch 'dev' into repo-add

main
Jef Roosens 2022-01-15 11:41:41 +01:00
commit f064cd6549
Signed by untrusted user: Jef Roosens
GPG Key ID: 955C0660072F691F
3 changed files with 8 additions and 9 deletions

View File

@ -3,24 +3,25 @@ platform: linux/amd64
pipeline: pipeline:
dev: dev:
image: plugins/docker image: woodpeckerci/plugin-docker-buildx
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
settings: settings:
repo: chewingbever/vieter repo: chewingbever/vieter
tag: dev tag: dev
platforms: [ linux/arm64/v8, linux/amd64 ]
when: when:
event: push event: push
branch: dev branch: dev
release: release:
image: plugins/docker image: woodpeckerci/plugin-docker-buildx
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
settings: settings:
repo: chewingbever/vieter repo: chewingbever/vieter
tag: tag:
- latest - latest
- $CI_COMMIT_TAG - $CI_COMMIT_TAG
mtu: 1000 platforms: [ linux/arm64/v8, linux/amd64 ]
when: when:
event: tag event: tag
branch: main branch: main

View File

@ -5,17 +5,15 @@ WORKDIR /app
# Copy over source code & build production binary # Copy over source code & build production binary
COPY src ./src COPY src ./src
COPY Makefile ./ COPY Makefile ./
RUN make prod
ENV LDFLAGS='-lz -lbz2 -llzma -lexpat -lzstd -llz4 -static'
RUN v -o pvieter -cflags "-O3" src
FROM alpine:3.15 FROM alpine:3.15
ENV REPO_DIR=/data ENV REPO_DIR=/data
RUN apk update && \
apk add --no-cache \
libarchive
COPY --from=builder /app/pvieter /usr/local/bin/vieter COPY --from=builder /app/pvieter /usr/local/bin/vieter
ENTRYPOINT [ "/usr/local/bin/vieter" ] ENTRYPOINT [ "/usr/local/bin/vieter" ]

View File

@ -8,7 +8,7 @@ LARCHIVE_LIB := $(LARCHIVE_DIR)/libarchive/libarchive.so
# Custom V command for linking libarchive # Custom V command for linking libarchive
# V := LDFLAGS=$(PWD)/$(LARCHIVE_LIB) v -cflags '-I$(PWD)/$(LARCHIVE_DIR) -I $(PWD)/$(LARCHIVE_DIR)' # V := LDFLAGS=$(PWD)/$(LARCHIVE_LIB) v -cflags '-I$(PWD)/$(LARCHIVE_DIR) -I $(PWD)/$(LARCHIVE_DIR)'
V := v V := v -showcc
all: vieter all: vieter