.drone.yml

@@ -111,31 +111,21 @@ type: docker
 
 steps:
     - name: manifest
-      image: appleboy/drone-ssh
-      volumes:
-          - name: ssh_key
-            path: /root/drone_rsa
+      image: plugins/manifest
       settings:
-          host:
-              from_secret: ssh_host
-          username:
-              from_secret: ssh_username
-          port:
-              from_secret: ssh_port
-          volumes:
-              - /root/.ssh/docker-build:/root/drone_rsa
-          key_path: /root/drone_rsa
-          command_timeout: 30m
-          script:
-              - env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create hrfee/jfa-go:latest --amend hrfee/jfa-go:manifest-latest-amd64 --amend hrfee/jfa-go:manifest-latest-arm64 --amend hrfee/jfa-go:manifest-latest-armhf
-              - env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push hrfee/jfa-go:latest
+          username: hrfee
+          password:
+              from_secret: docker_key
+          repo: hrfee/jfa-go
+          target: hrfee/jfa-go:latest
+          template: hrfee/jfa-go:manifest-latest-ARCH
+          platforms:
+              - linux/amd64
+              - linux/arm64
+              - linux/armhf
 trigger:
     event:
       - tag
-volumes:
-    - name: ssh_key
-      host:
-          path: /root/.ssh/docker-build
 depends_on:
     - amd64-docker
     - arm64-docker
@@ -266,40 +256,22 @@ type: docker
 
 steps:
     - name: manifest
-      image: appleboy/drone-ssh
-      volumes:
-          - name: ssh_key
-            path: /root/drone_rsa
+      image: plugins/manifest
       settings:
-          host:
-              from_secret: ssh_host
-          username:
-              from_secret: ssh_username
-          port:
-              from_secret: ssh_port
-          volumes:
-              - /root/.ssh/docker-build:/root/drone_rsa
-          key_path: /root/drone_rsa
-          command_timeout: 30m
-          script:
-              - env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create hrfee/jfa-go:unstable --amend hrfee/jfa-go:manifest-unstable-amd64 --amend hrfee/jfa-go:manifest-unstable-arm64 --amend hrfee/jfa-go:manifest-unstable-armhf
-              - env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push hrfee/jfa-go:unstable
+          username: hrfee
+          password:
+              from_secret: docker_key
+          repo: hrfee/jfa-go
+          target: hrfee/jfa-go:latest
+          template: hrfee/jfa-go:manifest-unstable-ARCH
+          platforms:
+              - linux/amd64
+              - linux/arm64
+              - linux/armhf
 depends_on:
     - amd64-docker-git
     - arm64-docker-git
     - armhf-docker-git
-trigger:
-    branch:
-        - main
-        - go1.16
-    event:
-        exclude:
-            - pull_request
-
-volumes:
-    - name: ssh_key
-      host:
-          path: /root/.ssh/docker-build
 ---
 name: jfa-go-pr
 kind: pipeline

config.go

@@ -38,6 +38,7 @@ func (app *appContext) loadConfig() error {
 	app.config.Section("invite_emails").Key("email_text").SetValue(app.config.Section("invite_emails").Key("email_text").MustString(filepath.Join(app.localPath, "invite-email.txt")))
 
 	app.config.Section("email_confirmation").Key("email_html").SetValue(app.config.Section("email_confirmation").Key("email_html").MustString(filepath.Join(app.localPath, "confirmation.html")))
+	fmt.Println(app.config.Section("email_confirmation").Key("email_html").String())
 	app.config.Section("email_confirmation").Key("email_text").SetValue(app.config.Section("email_confirmation").Key("email_text").MustString(filepath.Join(app.localPath, "confirmation.txt")))
 
 	app.config.Section("notifications").Key("expiry_html").SetValue(app.config.Section("notifications").Key("expiry_html").MustString(filepath.Join(app.localPath, "expired.html")))