Skip to content

Commit 2684e51

Browse files
committed
Complete transition from the projectactomic project to the containers one
Replace the occurrences of `github.com/projectatomic` with `github.com/containers` to ensure clean clones of the project are building, travis badges on the README work as expected and other minor things. Signed-off-by: Flavio Castelli <fcastelli@suse.com>
1 parent e814f96 commit 2684e51

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ that we follow.
1515
## Reporting Issues
1616

1717
Before reporting an issue, check our backlog of
18-
[open issues](https://github.com/projectatomic/skopeo/issues)
18+
[open issues](https://github.com/containers/skopeo/issues)
1919
to see if someone else has already reported it. If so, feel free to add
2020
your scenario, or additional information, to the discussion. Or simply
2121
"subscribe" to it to be notified when it is updated.
@@ -122,9 +122,9 @@ IRC group on `irc.freenode.net` called `container-projects`
122122
that has been setup.
123123

124124
For discussions around issues/bugs and features, you can use the github
125-
[issues](https://github.com/projectatomic/skopeo/issues)
125+
[issues](https://github.com/containers/skopeo/issues)
126126
and
127-
[PRs](https://github.com/projectatomic/skopeo/pulls)
127+
[PRs](https://github.com/containers/skopeo/pulls)
128128
tracking system.
129129

130130
<!--

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN set -x \
4343
ENV GOPATH /usr/share/gocode:/go
4444
ENV PATH $GOPATH/bin:/usr/share/gocode/bin:$PATH
4545
RUN go get github.com/golang/lint/golint
46-
WORKDIR /go/src/github.com/projectatomic/skopeo
47-
COPY . /go/src/github.com/projectatomic/skopeo
46+
WORKDIR /go/src/github.com/containers/skopeo
47+
COPY . /go/src/github.com/containers/skopeo
4848

4949
#ENTRYPOINT ["hack/dind"]

Dockerfile.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ RUN apt-get update && apt-get install -y \
1111
libostree-dev
1212

1313
ENV GOPATH=/
14-
WORKDIR /src/github.com/projectatomic/skopeo
14+
WORKDIR /src/github.com/containers/skopeo

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ binary: cmd/skopeo
7373
ifneq ($(DISABLE_CGO), 1)
7474
docker build ${DOCKER_BUILD_ARGS} -f Dockerfile.build -t $(DOCKER_BUILD_IMAGE) .
7575
endif
76-
docker run --rm --security-opt label:disable -v $$(pwd):/src/github.com/projectatomic/skopeo \
76+
docker run --rm --security-opt label:disable -v $$(pwd):/src/github.com/containers/skopeo \
7777
$(DOCKER_BUILD_IMAGE) make binary-local $(if $(DEBUG),DEBUG=$(DEBUG)) BUILDTAGS='$(BUILDTAGS)'
7878

7979
binary-static: cmd/skopeo
8080
ifneq ($(DISABLE_CGO), 1)
8181
docker build ${DOCKER_BUILD_ARGS} -f Dockerfile.build -t $(DOCKER_BUILD_IMAGE) .
8282
endif
83-
docker run --rm --security-opt label:disable -v $$(pwd):/src/github.com/projectatomic/skopeo \
83+
docker run --rm --security-opt label:disable -v $$(pwd):/src/github.com/containers/skopeo \
8484
$(DOCKER_BUILD_IMAGE) make binary-local-static $(if $(DEBUG),DEBUG=$(DEBUG)) BUILDTAGS='$(BUILDTAGS)'
8585

8686
# Build w/o using Docker containers
@@ -144,7 +144,7 @@ validate-local:
144144
hack/make.sh validate-git-marks validate-gofmt validate-lint validate-vet
145145

146146
test-unit-local:
147-
$(GPGME_ENV) $(GO) test -tags "$(BUILDTAGS)" $$($(GO) list -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/projectatomic/skopeo/\(integration\|vendor/.*\)$$')
147+
$(GPGME_ENV) $(GO) test -tags "$(BUILDTAGS)" $$($(GO) list -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/containers/skopeo/\(integration\|vendor/.*\)$$')
148148

149149
vendor: vendor.conf
150150
vndr -whitelist '^github.com/containers/image/docs/.*'

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
skopeo [![Build Status](https://travis-ci.org/projectatomic/skopeo.svg?branch=master)](https://travis-ci.org/projectatomic/skopeo)
1+
skopeo [![Build Status](https://travis-ci.org/containers/skopeo.svg?branch=master)](https://travis-ci.org/containers/skopeo)
22
=
33

4-
<img src="https://cdn.rawgit.com/projectatomic/skopeo/master/docs/skopeo.svg" width="250">
4+
<img src="https://cdn.rawgit.com/containers/skopeo/master/docs/skopeo.svg" width="250">
55

66
----
77

@@ -178,8 +178,8 @@ macOS$ brew install gpgme
178178
Make sure to clone this repository in your `GOPATH` - otherwise compilation fails.
179179

180180
```sh
181-
$ git clone https://github.com/projectatomic/skopeo $GOPATH/src/github.com/projectatomic/skopeo
182-
$ cd $GOPATH/src/github.com/projectatomic/skopeo && make binary-local
181+
$ git clone https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo
182+
$ cd $GOPATH/src/github.com/containers/skopeo && make binary-local
183183
```
184184

185185
### Building in a container

cmd/skopeo/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66

77
"github.com/containers/image/signature"
8+
"github.com/containers/skopeo/version"
89
"github.com/containers/storage/pkg/reexec"
9-
"github.com/projectatomic/skopeo/version"
1010
"github.com/sirupsen/logrus"
1111
"github.com/urfave/cli"
1212
)

hack/make.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66
#
77
# Requirements:
88
# - The current directory should be a checkout of the skopeo source code
9-
# (https://github.com/projectatomic/skopeo). Whatever version is checked out
9+
# (https://github.com/containers/skopeo). Whatever version is checked out
1010
# will be built.
1111
# - The script is intended to be run inside the docker container specified
1212
# in the Dockerfile at the root of the source. In other words:
@@ -19,7 +19,7 @@ set -e
1919

2020
set -o pipefail
2121

22-
export SKOPEO_PKG='github.com/projectatomic/skopeo'
22+
export SKOPEO_PKG='github.com/containers/skopeo'
2323
export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2424
export MAKEDIR="$SCRIPTDIR/make"
2525

hack/travis_osx.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ set -e
44
export GOPATH=$(pwd)/_gopath
55
export PATH=$GOPATH/bin:$PATH
66

7-
_projectatomic="${GOPATH}/src/github.com/projectatomic"
8-
mkdir -vp ${_projectatomic}
9-
ln -vsf $(pwd) ${_projectatomic}/skopeo
7+
_containers="${GOPATH}/src/github.com/containers"
8+
mkdir -vp ${_containers}
9+
ln -vsf $(pwd) ${_containers}/skopeo
1010

1111
go get -u github.com/cpuguy83/go-md2man github.com/golang/lint/golint
1212

13-
cd ${_projectatomic}/skopeo
13+
cd ${_containers}/skopeo
1414
make validate-local test-unit-local binary-local
1515
sudo make install
1616
skopeo -v

integration/check_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os/exec"
66
"testing"
77

8+
"github.com/containers/skopeo/version"
89
"github.com/go-check/check"
9-
"github.com/projectatomic/skopeo/version"
1010
)
1111

1212
const (

0 commit comments

Comments
 (0)