primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 12:10:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename docker image (#909)

Browse Source 
* 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:
Carolyn Van Slyck
2018-11-12 15:15:58 -06:00
committed by GitHub
parent c6644f82f9
commit bee463053a
9 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -39,7 +39,7 @@ docker: proxy-docker
.PHONY: proxy-docker .PHONY: proxy-docker
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 .PHONY: docker-push
docker-push: docker-push:
charts/proxy/Chart.yaml
+2 -2
View File
@@ -1,6 +1,6 @@
name: athens-proxy name: athens-proxy
version: 0.0.1 version: 0.2.0
appVersion: 0.0.1 appVersion: 0.2.0
description: The proxy server for Go modules description: The proxy server for Go modules
icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
keywords: keywords:
charts/proxy/values.yaml
+5 -5
View File
@@ -1,8 +1,8 @@
replicaCount: 1 replicaCount: 1
image: image:
registry: docker.io registry: docker.io
repository: gomods/proxy repository: gomods/athens
tag: v0.1.0 tag: v0.2.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -25,9 +25,9 @@ ingress:
annotations: annotations:
# Provide an array of values for the ingress host mapping # Provide an array of values for the ingress host mapping
hosts: hosts:
# Provide a base64 encoded cert for TLS use # Provide a base64 encoded cert for TLS use
tls: tls:
storage: storage:
type: disk type: disk
disk: disk:
docs/content/configuration/authentication.md
+13 -14
View File
@@ -8,12 +8,12 @@ weight: 1
## SVN private repositories ## SVN private repositories
1. Subversion creates an authentication structure in 1. Subversion creates an authentication structure in
~/.subversion/auth/svn.simple/<hash> ~/.subversion/auth/svn.simple/<hash>
2. In order to properly create the authentication file for your SVN servers you will need to authenticate to them and let svn build out the proper hashed files. 2. In order to properly create the authentication file for your SVN servers you will need to authenticate to them and let svn build out the proper hashed files.
$ svn list http://<domain:port>/svn/<somerepo> $ svn list http://<domain:port>/svn/<somerepo>
Authentication realm: <http://<domain> Subversion Repository Authentication realm: <http://<domain> Subversion Repository
Username: test Username: test
@@ -34,7 +34,7 @@ weight: 1
--name athens-proxy \ --name athens-proxy \
--restart always \ --restart always \
-p 3000:3000 \ -p 3000:3000 \
gomods/proxy:latest gomods/athens:latest
``` ```
**PowerShell** **PowerShell**
@@ -50,7 +50,7 @@ weight: 1
--name athens-proxy ` --name athens-proxy `
--restart always ` --restart always `
-p 3000:3000 ` -p 3000:3000 `
gomods/proxy:latest gomods/athens:latest
``` ```
## Bazaar(bzr) private repositories ## Bazaar(bzr) private repositories
@@ -58,18 +58,18 @@ weight: 1
1. Bazaaar config files are located in 1. Bazaaar config files are located in
- Unix - Unix
~/.bazaar/ ~/.bazaar/
- Windows - Windows
C:\Documents and Settings\<username>\Application Data\Bazaar\2.0 C:\Documents and Settings\<username>\Application Data\Bazaar\2.0
- You can check your location using - You can check your location using
bzr version bzr version
2. There are 3 typical configuration files 2. There are 3 typical configuration files
- bazaar.conf - bazaar.conf
- default config options - default config options
- locations.conf - locations.conf
@@ -83,12 +83,12 @@ weight: 1
- [header] this denotes a section header - [header] this denotes a section header
- section options reside in a header section and contain an option name an equals sign and a value - section options reside in a header section and contain an option name an equals sign and a value
- EXAMPLE: - EXAMPLE:
[DEFAULT] [DEFAULT]
email = John Doe <jdoe@isp.com> email = John Doe <jdoe@isp.com>
4. Authentication Configuration 4. Authentication Configuration
Allows one to specify credentials for remote servers. Allows one to specify credentials for remote servers.
This can be used for all the supported transports and any part of bzr that requires authentication(smtp for example). This can be used for all the supported transports and any part of bzr that requires authentication(smtp for example).
The syntax obeys the same rules as the others except for the option policies which don't apply. The syntax obeys the same rules as the others except for the option policies which don't apply.
@@ -157,7 +157,7 @@ weight: 1
--name athens-proxy \ --name athens-proxy \
--restart always \ --restart always \
-p 3000:3000 \ -p 3000:3000 \
gomods/proxy:latest gomods/athens:latest
``` ```
**PowerShell** **PowerShell**
@@ -173,6 +173,5 @@ weight: 1
--name athens-proxy ` --name athens-proxy `
--restart always ` --restart always `
-p 3000:3000 ` -p 3000:3000 `
gomods/proxy:latest gomods/athens:latest
``` ```
docs/content/install/_index.md
+2 -2
View File
@@ -17,7 +17,7 @@ We feel that Athens should keep the community federated and open, and nobody sho
To make sure it's easy to install, we try to provide as many ways as possible to install and run Athens: To make sure it's easy to install, we try to provide as many ways as possible to install and run Athens:
- It's written in Go, so we provide a self-contained binary. You can configure and run the binary on your machine(s) - 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 - 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) - We provide [Kubernetes](https://kubernetes.io) [Helm Charts](https://helm.sh) with [instructions on how to run Athens on Kubernetes](./install-on-kubernetes)
docs/content/install/shared-team-instance.md
+5 -5
View File
@@ -26,7 +26,7 @@ docker run -d -v $ATHENS_STORAGE:/var/lib/athens \
--name athens-proxy \ --name athens-proxy \
--restart always \ --restart always \
-p 3000:3000 \ -p 3000:3000 \
gomods/proxy:latest gomods/athens:latest
``` ```
**PowerShell** **PowerShell**
@@ -39,7 +39,7 @@ docker run -d -v "$($env:ATHENS-STORAGE):/var/lib/athens" `
--name athens-proxy ` --name athens-proxy `
--restart always ` --restart always `
-p 3000:3000 ` -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 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 ```console
$ docker ps $ docker ps
CONTAINER ID IMAGE COMMAND PORTS NAMES 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: 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 \ --name athens-proxy \
--restart always \ --restart always \
-p 3000:3000 \ -p 3000:3000 \
gomods/proxy:latest gomods/athens:latest
``` ```
**PowerShell** **PowerShell**
@@ -153,7 +153,7 @@ docker run -d -v "$($env:ATHENS-STORAGE):/var/lib/athens" `
--name athens-proxy ` --name athens-proxy `
--restart always ` --restart always `
-p 3000:3000 ` -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. 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.
docs/content/walkthrough.md
+2 -2
View File
@@ -101,7 +101,7 @@ docker run -d -v $ATHENS_STORAGE:/var/lib/athens \
--name athens-proxy \ --name athens-proxy \
--restart always \ --restart always \
-p 3000:3000 \ -p 3000:3000 \
gomods/proxy:latest gomods/athens:latest
``` ```
**PowerShell** **PowerShell**
@@ -114,7 +114,7 @@ docker run -d -v "$($env:ATHENS-STORAGE):/var/lib/athens" `
--name athens-proxy ` --name athens-proxy `
--restart always ` --restart always `
-p 3000:3000 ` -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) Next, you will need to enable the [Go Modules](https://github.com/golang/go/wiki/Modules)
init.ps1
+4 -5
View File
@@ -64,7 +64,7 @@ if ($build.IsPresent) {
finally { finally {
Pop-Location Pop-Location
} }
finally { finally {
Pop-Location Pop-Location
} }
@@ -76,7 +76,7 @@ if ($run.IsPresent) {
} }
if ($docs.IsPresent) { if ($docs.IsPresent) {
Set-Location docs Set-Location docs
& hugo & hugo
} }
@@ -121,12 +121,12 @@ if ($test_e2e.IsPresent) {
} }
if ($docker.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) { 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) { if ($bench.IsPresent) {
@@ -136,4 +136,3 @@ if ($bench.IsPresent) {
if ($down.IsPresent) { if ($down.IsPresent) {
& docker-compose -p athensdev down -v & docker-compose -p athensdev down -v
} }
scripts/push-docker-images.sh
+2 -2
View File
@@ -18,11 +18,11 @@ else
BRANCH=${BRANCH:-$(git symbolic-ref -q --short HEAD || echo "")} BRANCH=${BRANCH:-$(git symbolic-ref -q --short HEAD || echo "")}
fi 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 if [[ "${MUTABLE_TAG:-}" == "" ]]; then
# tagged builds # tagged builds
if [[ "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then if [[ "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
MUTABLE_TAG="stable" MUTABLE_TAG="latest"
# master build # master build
elif [[ "$BRANCH" == "master" ]]; then elif [[ "$BRANCH" == "master" ]]; then
MUTABLE_TAG="canary" MUTABLE_TAG="canary"