mirror of
https://github.com/gomods/athens
synced 2026-02-03 12:10:32 +00:00
Rename docker image (#909)
* Rename docker image to gomods/athens * Bump chart version to match new release version * Switch from stable tag to latest tag Our docs used latest, and it's awkard when you don't have a latest tag anyway
This commit is contained in:
committed by
GitHub
parent
c6644f82f9
commit
bee463053a
@@ -39,7 +39,7 @@ docker: proxy-docker
|
||||
|
||||
.PHONY: proxy-docker
|
||||
proxy-docker:
|
||||
docker build -t gomods/proxy -f cmd/proxy/Dockerfile .
|
||||
docker build -t gomods/athens -f cmd/proxy/Dockerfile .
|
||||
|
||||
.PHONY: docker-push
|
||||
docker-push:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name: athens-proxy
|
||||
version: 0.0.1
|
||||
appVersion: 0.0.1
|
||||
version: 0.2.0
|
||||
appVersion: 0.2.0
|
||||
description: The proxy server for Go modules
|
||||
icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
|
||||
keywords:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: gomods/proxy
|
||||
tag: v0.1.0
|
||||
repository: gomods/athens
|
||||
tag: v0.2.0
|
||||
## Specify a imagePullPolicy
|
||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
|
||||
@@ -34,7 +34,7 @@ weight: 1
|
||||
--name athens-proxy \
|
||||
--restart always \
|
||||
-p 3000:3000 \
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
**PowerShell**
|
||||
@@ -50,7 +50,7 @@ weight: 1
|
||||
--name athens-proxy `
|
||||
--restart always `
|
||||
-p 3000:3000 `
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
## Bazaar(bzr) private repositories
|
||||
@@ -157,7 +157,7 @@ weight: 1
|
||||
--name athens-proxy \
|
||||
--restart always \
|
||||
-p 3000:3000 \
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
**PowerShell**
|
||||
@@ -173,6 +173,5 @@ weight: 1
|
||||
--name athens-proxy `
|
||||
--restart always `
|
||||
-p 3000:3000 `
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
|
||||
@@ -19,5 +19,5 @@ To make sure it's easy to install, we try to provide as many ways as possible to
|
||||
|
||||
- It's written in Go, so we provide a self-contained binary. You can configure and run the binary on your machine(s)
|
||||
- Instructions on how to run directly from the binary are coming soon
|
||||
- We provide a [Docker image](https://hub.docker.com/r/gomods/proxy/) and [instructions on how to run it](./shared-team-instance)
|
||||
- We provide a [Docker image](https://hub.docker.com/r/gomods/athens/) and [instructions on how to run it](./shared-team-instance)
|
||||
- We provide [Kubernetes](https://kubernetes.io) [Helm Charts](https://helm.sh) with [instructions on how to run Athens on Kubernetes](./install-on-kubernetes)
|
||||
|
||||
@@ -26,7 +26,7 @@ docker run -d -v $ATHENS_STORAGE:/var/lib/athens \
|
||||
--name athens-proxy \
|
||||
--restart always \
|
||||
-p 3000:3000 \
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
**PowerShell**
|
||||
@@ -39,7 +39,7 @@ docker run -d -v "$($env:ATHENS-STORAGE):/var/lib/athens" `
|
||||
--name athens-proxy `
|
||||
--restart always `
|
||||
-p 3000:3000 `
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
Note: if you have not previously mounted this drive with Docker for Windows, you may be prompted to allow access
|
||||
@@ -49,7 +49,7 @@ Athens should now be running as a Docker container with the local directory, `at
|
||||
```console
|
||||
$ docker ps
|
||||
CONTAINER ID IMAGE COMMAND PORTS NAMES
|
||||
f0429b81a4f9 gomods/proxy:latest "/bin/app" 0.0.0.0:3000->3000/tcp athens-proxy
|
||||
f0429b81a4f9 gomods/athens:latest "/bin/app" 0.0.0.0:3000->3000/tcp athens-proxy
|
||||
```
|
||||
|
||||
Now, we can use Athens from any development machine that has Go 1.11 installed. To verify this, try the following example:
|
||||
@@ -142,7 +142,7 @@ docker run -d -v $ATHENS_STORAGE:/var/lib/athens \
|
||||
--name athens-proxy \
|
||||
--restart always \
|
||||
-p 3000:3000 \
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
**PowerShell**
|
||||
@@ -153,7 +153,7 @@ docker run -d -v "$($env:ATHENS-STORAGE):/var/lib/athens" `
|
||||
--name athens-proxy `
|
||||
--restart always `
|
||||
-p 3000:3000 `
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
When we re-run our Go example, the Go cli will again download module from Athens. Athens, however, will not need to retrieve the module. It will be served from the Athens on-disk storage.
|
||||
|
||||
@@ -101,7 +101,7 @@ docker run -d -v $ATHENS_STORAGE:/var/lib/athens \
|
||||
--name athens-proxy \
|
||||
--restart always \
|
||||
-p 3000:3000 \
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
**PowerShell**
|
||||
@@ -114,7 +114,7 @@ docker run -d -v "$($env:ATHENS-STORAGE):/var/lib/athens" `
|
||||
--name athens-proxy `
|
||||
--restart always `
|
||||
-p 3000:3000 `
|
||||
gomods/proxy:latest
|
||||
gomods/athens:latest
|
||||
```
|
||||
|
||||
Next, you will need to enable the [Go Modules](https://github.com/golang/go/wiki/Modules)
|
||||
|
||||
@@ -121,12 +121,12 @@ if ($test_e2e.IsPresent) {
|
||||
}
|
||||
|
||||
if ($docker.IsPresent) {
|
||||
& docker build -t gomods/proxy -f cmd/proxy/Dockerfile .
|
||||
& docker build -t gomods/athens -f cmd/proxy/Dockerfile .
|
||||
}
|
||||
|
||||
|
||||
if ($proxy_docker.IsPresent) {
|
||||
& docker build -t gomods/proxy -f cmd/proxy/Dockerfile .
|
||||
& docker build -t gomods/athens -f cmd/proxy/Dockerfile .
|
||||
}
|
||||
|
||||
if ($bench.IsPresent) {
|
||||
@@ -136,4 +136,3 @@ if ($bench.IsPresent) {
|
||||
if ($down.IsPresent) {
|
||||
& docker-compose -p athensdev down -v
|
||||
}
|
||||
|
||||
|
||||
@@ -18,11 +18,11 @@ else
|
||||
BRANCH=${BRANCH:-$(git symbolic-ref -q --short HEAD || echo "")}
|
||||
fi
|
||||
|
||||
# MUTABLE_TAG is the docker image tag that we will reuse between pushes, it is not a stable tag like a commit hash or tag.
|
||||
# MUTABLE_TAG is the docker image tag that we will reuse between pushes, it is not an immutable tag like a commit hash or tag.
|
||||
if [[ "${MUTABLE_TAG:-}" == "" ]]; then
|
||||
# tagged builds
|
||||
if [[ "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
|
||||
MUTABLE_TAG="stable"
|
||||
MUTABLE_TAG="latest"
|
||||
# master build
|
||||
elif [[ "$BRANCH" == "master" ]]; then
|
||||
MUTABLE_TAG="canary"
|
||||
|
||||
Reference in New Issue
Block a user