Skip to content

Commit f28eb45

Browse files
TartanLeGrandTartanLeGrand
committed
!feat(rootless): add podman for rootless
1 parent 10c4b1c commit f28eb45

File tree

20 files changed

+67
-70
lines changed

20 files changed

+67
-70
lines changed

Diff for: ‎Makefile

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
.PHONY: test-docker build-docker build-linux-cgo release test-excoveralls
1+
.PHONY: test-podman build-podman build-linux-cgo release test-excoveralls
22

33
AWS ?= $(shell which aws)
44
SHA_SUM ?= $(shell which shasum)
55
GPG ?= $(shell which gpg)
66
TAR ?= $(shell which tar)
7-
DOCKER_RUN ?= $(shell which docker) run --rm
7+
PODMAN_RUN ?= $(shell which podman) run --rm
88
PANDOC ?= $(shell which pandoc)
99

1010
MAN_FILES = $(wildcard man/*.md)
@@ -35,7 +35,7 @@ endef
3535
man/%: man/%.md
3636
$(PANDOC) -s -t man $< -o $@
3737

38-
all: test-docker build-all $(MAN_PAGES)
38+
all: test-podman build-all $(MAN_PAGES)
3939

4040
test:
4141
go test $(shell go list ./... | grep -v /vendor/)
@@ -81,9 +81,9 @@ build-darwin:
8181
PREFIX=artifacts/ \
8282
BINARY_SUFFIX=-$(VERSION)-darwin-amd64
8383

84-
build-docker: BINARY_SUFFIX ?= -$(VERSION)-$$GOOS-$$GOARCH
85-
build-docker:
86-
$(DOCKER_RUN) \
84+
build-podman: BINARY_SUFFIX ?= -$(VERSION)-$$GOOS-$$GOARCH
85+
build-podman:
86+
$(PODMAN_RUN) \
8787
--env PREFIX=/artifacts/ \
8888
--env BINARY_SUFFIX=${BINARY_SUFFIX} \
8989
--env GOARCH \
@@ -95,53 +95,53 @@ build-docker:
9595
--workdir "/src/$(PROJECT)" \
9696
golang:1.15 make build BUILD_TAGS=${BUILD_TAGS}
9797

98-
build-docker-linux:
99-
$(MAKE) build-docker GOOS=linux GOARCH=amd64 CGO_ENABLED=0
98+
build-podman-linux:
99+
$(MAKE) build-podman GOOS=linux GOARCH=amd64 CGO_ENABLED=0
100100

101-
build-docker-linux-arm64:
102-
$(MAKE) build-docker GOOS=linux GOARCH=arm64 CGO_ENABLED=0
101+
build-podman-linux-arm64:
102+
$(MAKE) build-podman GOOS=linux GOARCH=arm64 CGO_ENABLED=0
103103

104-
build-docker-linux-cgo:
105-
$(MAKE) build-docker GOOS=linux GOARCH=amd64 CGO_ENABLED=1 \
104+
build-podman-linux-cgo:
105+
$(MAKE) build-podman GOOS=linux GOARCH=amd64 CGO_ENABLED=1 \
106106
BUILD_TAGS="netcgo" BINARY_SUFFIX=-$(VERSION)-netcgo-linux-amd64
107107

108-
test-docker:
109-
$(DOCKER_RUN) \
108+
test-podman:
109+
$(PODMAN_RUN) \
110110
--env GOPATH=/ \
111111
--volume "$(PWD)":"/src/$(PROJECT)":ro \
112112
--workdir "/src/$(PROJECT)" \
113113
golang:1.15 make test
114114

115-
benchmark-docker:
116-
$(DOCKER_RUN) \
115+
benchmark-podman:
116+
$(PODMAN_RUN) \
117117
--env GOPATH=/ \
118118
--volume "$(PWD)":"/src/$(PROJECT)":ro \
119119
--workdir "/src/$(PROJECT)" \
120120
golang:1.15 make benchmark
121121

122122
test-simplecov:
123-
docker build -f integration-tests/simplecov/Dockerfile .
123+
podman build -f integration-tests/simplecov/Dockerfile .
124124

125125
test-lcov:
126-
docker build -f integration-tests/lcov/Dockerfile .
126+
podman build -f integration-tests/lcov/Dockerfile .
127127

128128
test-covpy:
129-
docker build -f integration-tests/coverage_py/Dockerfile .
129+
podman build -f integration-tests/coverage_py/Dockerfile .
130130

131131
test-gcov:
132-
docker build -f integration-tests/gcov/Dockerfile .
132+
podman build -f integration-tests/gcov/Dockerfile .
133133

134134
test-gocov:
135-
docker build -f integration-tests/gocov/Dockerfile .
135+
podman build -f integration-tests/gocov/Dockerfile .
136136

137137
test-clover:
138-
docker build -f integration-tests/clover/Dockerfile .
138+
podman build -f integration-tests/clover/Dockerfile .
139139

140140
test-cobertura:
141-
docker build -f integration-tests/cobertura/Dockerfile .
141+
podman build -f integration-tests/cobertura/Dockerfile .
142142

143143
test-excoveralls:
144-
docker build -f integration-tests/excoveralls/Dockerfile .
144+
podman build -f integration-tests/excoveralls/Dockerfile .
145145

146146
publish-head:
147147
$(call upload_artifacts,head)
@@ -174,17 +174,17 @@ tag:
174174

175175
# Must be run in a OS X machine. OS X binary is build natively.
176176
manual-release:
177-
$(MAKE) build-docker-linux
178-
$(MAKE) build-docker-linux-arm64
179-
$(MAKE) build-docker-linux-cgo
177+
$(MAKE) build-podman-linux
178+
$(MAKE) build-podman-linux-arm64
179+
$(MAKE) build-podman-linux-cgo
180180
$(MAKE) build-darwin
181181
$(MAKE) gen-linux-checksum
182182
$(MAKE) gen-linux-arm64-checksum
183183
$(MAKE) gen-linux-cgo-checksum
184184
$(MAKE) gen-darwin-checksum
185-
$(MAKE) build-docker-linux VERSION=latest
186-
$(MAKE) build-docker-linux-arm64 VERSION=latest
187-
$(MAKE) build-docker-linux-cgo VERSION=latest
185+
$(MAKE) build-podman-linux VERSION=latest
186+
$(MAKE) build-podman-linux-arm64 VERSION=latest
187+
$(MAKE) build-podman-linux-cgo VERSION=latest
188188
$(MAKE) build-darwin VERSION=latest
189189
$(MAKE) gen-linux-checksum VERSION=latest
190190
$(MAKE) gen-linux-arm64-checksum VERSION=latest

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The test reporter is distributed as a pre-built binary named cc-test-reporter. Y
2727

2828
### Linux ARM64
2929
- [codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-arm64](https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-arm64)
30-
- [codeclimate.com/downloads/test-reporter/test-reporter-${VERSION}-linux-amd64](https://codeclimate.com/downloads/test-reporter/test-reporter-${VERSION}-linux-arm64)
30+
- [codeclimate.com/downloads/test-reporter/test-reporter-${VERSION}-linux-arm64](https://codeclimate.com/downloads/test-reporter/test-reporter-${VERSION}-linux-arm64)
3131

3232
### Linux netcgo (recommended if you're using a VPN)
3333
- [codeclimate.com/downloads/test-reporter/test-reporter-latest-netcgo-linux-amd64](https://codeclimate.com/downloads/test-reporter/test-reporter-latest-netcgo-linux-amd64)

Diff for: ‎examples/go_examples.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ RUN "$(go env GOPATH)/bin/go-bindata" -o global/assets.go -pkg global assets/...
9393
travis.yml
9494
```yaml
9595
services:
96-
- docker
96+
- podman
9797

9898
script:
99-
- docker build -t app .
100-
- docker run --rm app ./codecoverage.sh
99+
- podman build -t app .
100+
- podman run --rm app ./codecoverage.sh
101101
```
102102
103103

Diff for: ‎examples/multiple_suites.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
version: 2.0
1414
defaults: &defaults
1515
working_directory: ~/repo
16-
docker:
16+
podman:
1717
- image: circleci/ruby:2.4.2-jessie-node-browsers
1818
environment:
1919
PGHOST: 127.0.0.1

Diff for: ‎examples/php_examples.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ jobs:
9797
build:
9898
environment:
9999
CC_TEST_REPORTER_ID: YOUR_CODE_CLIMATE_REPORTER_ID
100-
docker:
100+
podman:
101101
- image: notnoopci/php:7.1.5-browsers
102102
working_directory: ~/repo
103103
steps:
104104
- checkout
105105
- run: sudo pecl channel-update pecl.php.net
106-
- run: sudo pecl install xdebug && sudo docker-php-ext-enable xdebug
106+
- run: sudo pecl install xdebug && sudo podman-php-ext-enable xdebug
107107
- run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
108108
- run: chmod +x ./cc-test-reporter
109109
- run: sudo mkdir -p $CIRCLE_TEST_REPORTS/phpunit

Diff for: ‎examples/ruby_examples.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
RACK_ENV: test
133133
COVERAGE: true
134134
TZ: /usr/share/zoneinfo/America/Chicago
135-
docker:
135+
podman:
136136
- image: circleci/ruby:2.5.1-stretch-node
137137
environment:
138138
PGHOST: 127.0.0.1
@@ -218,7 +218,7 @@ jobs:
218218
path: test-artifacts
219219
220220
upload-coverage:
221-
docker:
221+
podman:
222222
- image: circleci/ruby:2.5.1-stretch-node
223223
environment:
224224
CC_TEST_REPORTER_ID: c3ff91e23ea0fea718bb62dae0a8a5440dc082d5d2bb508af6b33d0babac479a

Diff for: ‎vendor/github.com/spf13/cobra/.travis.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/spf13/cobra/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/plan9/mksyscall.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/unix/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/unix/linux/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/unix/linux/mkall.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/unix/linux/mksysnum.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/unix/mkall.sh

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/unix/mkerrors.sh

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/unix/mkpost.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/sys/unix/mksyscall.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/golang.org/x/tools/cmd/tip/Makefile

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/gopkg.in/src-d/go-git.v4/_examples/storage/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/gopkg.in/src-d/go-git.v4/references_test.go

+1-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)