1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-10-18 09:00:11 +00:00

Compare commits

...

2 Commits

Author SHA1 Message Date
2ee0ed55f6
forgot key agh 2021-02-12 00:35:20 +00:00
94981f4891
dont use drone manifest plugin 2021-02-11 23:52:05 +00:00
2 changed files with 50 additions and 23 deletions

View File

@ -111,21 +111,31 @@ type: docker
steps:
- name: manifest
image: plugins/manifest
image: appleboy/drone-ssh
volumes:
- name: ssh_key
path: /root/drone_rsa
settings:
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
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
trigger:
event:
- tag
volumes:
- name: ssh_key
host:
path: /root/.ssh/docker-build
depends_on:
- amd64-docker
- arm64-docker
@ -256,22 +266,40 @@ type: docker
steps:
- name: manifest
image: plugins/manifest
image: appleboy/drone-ssh
volumes:
- name: ssh_key
path: /root/drone_rsa
settings:
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
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
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

View File

@ -38,7 +38,6 @@ 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")))