Commit 551d5de5 authored by Furkan Mustafa's avatar Furkan Mustafa

Merge branch 'alpine-and-go-update' into '201903-small-improvements'

Updates in order to pass tests

See merge request !41
parents 9a681938 92538f27
......@@ -96,7 +96,7 @@ publish:oci-image-layout:
script:
- echo http://dl-cdn.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories
- apk update
- apk add go=1.11.5-r0
- apk add go=1.12.5-r0
- apk add musl-dev
- go get github.com/coolljt0725/docker2oci
- docker save $CI_REGISTRY_IMAGE:ci-${CI_PIPELINE_ID} | $HOME/go/bin/docker2oci image-layout-${CI_COMMIT_TAG}
......@@ -184,7 +184,7 @@ start_test_services:
# build and copy tar-split
- echo http://dl-cdn.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories
- apk update
- apk add go=1.11.5-r0
- apk add go=1.12.5-r0
- apk add musl-dev
- go get -d github.com/vbatts/tar-split/cmd/tar-split
- go build -o $HOME/tar-split -a -ldflags '-extldflags "-static"' $HOME/go/src/github.com/vbatts/tar-split/cmd/tar-split
......
FROM golang:1.11.6-stretch AS tar-split-builder
FROM golang:1.12.5-stretch AS tar-split-builder
RUN go get -d github.com/vbatts/tar-split/cmd/tar-split
RUN go build -o /tar-split -a -ldflags '-extldflags "-static"' /go/src/github.com/vbatts/tar-split/cmd/tar-split
......
FROM golang:1.11.5-alpine3.9
FROM golang:1.12.5-alpine3.9
LABEL maintainer="info@beiran.io"
RUN apk add git && go get -d github.com/vbatts/tar-split/cmd/tar-split && \
CGO_ENABLED=0 go build -o /tar-split /go/src/github.com/vbatts/tar-split/cmd/tar-split
#!/usr/bin/env bats
@test "pull alpine from other node" {
run python -m beiran docker image pull alpine
@test "pull alpine from other node (with '--noprogress' option)" {
run python -m beiran docker image pull alpine --noprogress
[ "$status" -eq 0 ]
}
#!/usr/bin/env bats
@test "pull alpine from other node (with '--progress' option)" {
run python -m beiran docker image pull alpine --progress
@test "pull alpine from other node" {
run python -m beiran docker image pull alpine
[ "$status" -eq 0 ]
}
......@@ -8,7 +8,7 @@
- variable_binds: {test_docker_layer: 'sha256:d1725b59e92d6462c6d688ef028979cc6bb150762db99d18dddc7fa54b82b0ce',
test_docker_image: 'hello-world',
test_docker_image_id: 'sha256:fce289e99eb9bca977dae136fbe2a82b6b7d4c372474c9235adc1741675f587e',
test_docker_repo_digest: 'sha256:2557e3c07ed1e38f26e389462d03ed943586f744621577a99efb77324b0fe535'}
test_docker_repo_digest: 'sha256:b585da5d6abc6e95ca36d482bd9df9f411c3e93d0115ff3da3d0581f7968b5b5'}
- test:
- name: "Version from root handler"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment