Merge pull request #78 from stelcheck/docs/release

Docs/release

CONTRIBUTING.md

@@ -79,7 +79,45 @@ them under the `./scripts` folder.
 Releasing
 ---------
 
-To make a release, update `buildconfig.yml`, then:
+**Note**: You will need to set a `GITHUB_TOKEN` environment variable for the
+release process to work properly. 
+
+See [this help page](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/) to
+learn how to
+create one. We then recommend to add the variable to your `~/.bashrc`. `~/.zshrc` or equivalent.
+
+> ~/.bashrc
+
+```shell
+export GITHUB_TOKEN="deadbeef15dead"
+```
+
+To make a release, update `buildconfig.yml`. There are two version
+numbers being recorded: one for the binary, and one for the Dawn image.
+
+> buildconfig.yml
+
+```yml
+binary:
+  # The name of the binary to output
+  name: "dawn"
+
+  # The current version of the binary
+  version: "0.15.0"
+
+# [...]
+image:
+  # User or organization on Docker Hub
+  organization: wizcorp
+
+  # Image name (must match the Docker Hub repository name)
+  name: dawn
+
+  # Current image version
+  version: "0.15.0"
+```
+
+> Releasing Dawn
 
 ```bash
 ./scripts/release/release.sh

buildconfig.yml

@@ -41,7 +41,7 @@ binary:
   name: "dawn"
 
   # The current version of the binary
-  version: "0.14.7"
+  version: "0.15.0"
 
   # (Optional) URLs to call when attempting auto-update.
   # Defaults:
@@ -78,7 +78,7 @@ image:
   name: dawn
 
   # Current image version
-  version: "0.14.7"
+  version: "0.15.0"
 
   # Root folder where most files will be uploaded or mounted
   root_folder: /dawn

docker-image/ansible/roles/portainer/defaults/main.yml

@@ -20,6 +20,6 @@ ldap_server_port: 389
 ldap_dc: "dc={{ local_domain_name.split('.') | join(',dc=') }}"
 ldap_admin_user: "cn=admin,{{ ldap_dc }}"
 
-portainer_ldap_user_search: "users,{{ ldap_dc }}"
-portainer_ldap_group_search: "groups,{{ ldap_dc }}"
+portainer_ldap_user_search: "ou=users,{{ ldap_dc }}"
+portainer_ldap_group_search: "ou=groups,{{ ldap_dc }}"
 

src/cli.go

@@ -127,6 +127,8 @@ func printHelp() {
 	fmt.Println("    --update              Update this binary")
 	fmt.Println("    --version             Show version information")
 	fmt.Println("    --build <environment> Build a docker image that embeds the environment")
+	fmt.Println("    --push <environment>  Push image for an environment")
+	fmt.Println("    --pull <environment>  Pull image for an environment")
 	fmt.Println("    --help                Show this screen")
 	fmt.Println()
 	fmt.Printf("For more information: %s\n", cliDocsURL)
@@ -244,6 +246,10 @@ func getConfigurationFolderPath() string {
 	return fmt.Sprintf("%s/%s", getProjectRoot(), cliConfigurationFolder)
 }
 
+func getEnvironmentFolderPath(env string) string {
+	return fmt.Sprintf("%s/%s", getConfigurationFolderPath(), env)
+}
+
 func getConfigurationFilePath() string {
 	return fmt.Sprintf("%s/%s", getConfigurationFolderPath(), cliConfigurationFilename)
 }
@@ -434,6 +440,34 @@ func runUpdate() (int, error) {
 	return runSubProcess(shell, arguments)
 }
 
+func runPull(environment string) (int, error) {
+	configuration, err := getConfigurationForEnvironment(environment)
+	if err != nil {
+		panic(err)
+	}
+
+	arguments := []string{
+		"pull",
+		fmt.Sprintf("%s:%s", configuration.Image, environment),
+	}
+
+	return runSubProcess("docker", arguments)
+}
+
+func runPush(environment string) (int, error) {
+	configuration, err := getConfigurationForEnvironment(environment)
+	if err != nil {
+		panic(err)
+	}
+
+	arguments := []string{
+		"push",
+		fmt.Sprintf("%s:%s", configuration.Image, environment),
+	}
+
+	return runSubProcess("docker", arguments)
+}
+
 func runBuild(environment string) (int, error) {
 	configuration, err := getConfigurationForEnvironment(environment)
 	if err != nil {
@@ -512,6 +546,20 @@ func main() {
 		printVersion()
 	case "--update":
 		exitCode, err = runUpdate()
+	case "--pull":
+		if len(args) < 2 {
+			printHelp()
+			return
+		}
+
+		exitCode, err = runPull(args[1])
+	case "--push":
+		if len(args) < 2 {
+			printHelp()
+			return
+		}
+
+		exitCode, err = runPush(args[1])
 	case "--build":
 		if len(args) < 2 {
 			printHelp()
@@ -547,6 +595,11 @@ func main() {
 			panic(err)
 		}
 
+		envFolder := getEnvironmentFolderPath(environment)
+		if _, err := os.Stat(envFolder); os.IsNotExist(err) {
+			exitCode, err = runBuild(environment)
+		}
+
 		// Run the container
 		exitCode, err = runEnvironmentContainer(environment, configuration, command)
 	}