Skip to content

Commit

Permalink
Merge pull request #7 from Cryptophobia/master
Browse files Browse the repository at this point in the history
chore(Makefile): upgrading go-dev container to v1.28.3
  • Loading branch information
Cryptophobia authored Oct 9, 2020
2 parents e6ce19d + b6fe20b commit decf04a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ SHORT_NAME := registry
include includes.mk versioning.mk

# the filepath to this repository, relative to $GOPATH/src
REPO_PATH = github.com/deis/registry
REPO_PATH = github.com/teamhephy/registry

SHELL_SCRIPTS = $(wildcard _scripts/*.sh contrib/ci/*.sh)

# The following variables describe the containerized development environment
# and other build options
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
DEV_ENV_IMAGE := hephy/go-dev:v1.28.3
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ To deploy the image via patching the registry deployment run:
$ make deploy
```

[issues]: https://github.com/deisthree/registry/issues
[prs]: https://github.com/deisthree/registry/pulls
[v2.18]: https://github.com/deisthree/workflow/releases/tag/v2.18.0
[issues]: https://github.com/teamhephy/registry/issues
[prs]: https://github.com/teamhephy/registry/pulls
[v2.18]: https://github.com/teamhephy/workflow/releases/tag/v2.18.0
7 changes: 3 additions & 4 deletions charts/registry/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: registry
home: https://github.com/deisthree/registry
home: https://github.com/teamhephy/registry
version: <Will be populated by the ci before publishing the chart>
description: Docker registry for Deis Workflow.
description: Docker registry for Hephy Workflow.
maintainers:
- name: Deis Team
email: [email protected]
- email: [email protected]
2 changes: 1 addition & 1 deletion versioning.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MUTABLE_VERSION ?= canary
VERSION ?= git-$(shell git rev-parse --short HEAD)
IMAGE_PREFIX ?= deis
IMAGE_PREFIX ?= hephy

IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
MUTABLE_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
Expand Down

0 comments on commit decf04a

Please sign in to comment.