From a533caa9447c78fd007dfb7ada15c41390e97e05 Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Sat, 4 Nov 2017 18:56:35 +0000 Subject: rearranging helper scripts in snap-src Signed-off-by: Ondrej Kubik --- snapcraft.yaml | 8 -------- 1 file changed, 8 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 1a85f682..7766f677 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -124,11 +124,3 @@ parts: helpers: source: snap-src plugin: dump - organize: - wekan-control: bin/wekan-control - mongodb-control: bin/mongodb-control - wekan-read-settings: bin/wekan-read-settings - wekan-help: bin/wekan-help - mongodb-backup: bin/mongodb-backup - mongodb-restore: bin/mongodb-restore - config: bin/config -- cgit v1.2.3-1-g7c22 From e077c85d003fb3cfd837ad8064ade767fa8fe04f Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Sat, 4 Nov 2017 19:23:28 +0000 Subject: Adding caddy support Signed-off-by: Ondrej Kubik --- snapcraft.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index 7766f677..ce41bdf3 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -38,6 +38,11 @@ apps: daemon: simple plugs: [network, network-bind] + caddy-service: + command: caddy-control + daemon: simple + plugs: [network, network-bind] + help: command: wekan-help @@ -124,3 +129,12 @@ parts: helpers: source: snap-src plugin: dump + + caddy: + plugin: go + go-importpath: github.com/mholt/caddy + source: https://github.com/mholt/caddy.git + source-type: git + source-commit: 53e117802fedd5915eeb32907873d8786a4b2936 + prime: + - bin/caddy -- cgit v1.2.3-1-g7c22 From f7920da0cf74290ffec30a967a1d70ab36d22268 Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Sat, 4 Nov 2017 19:42:11 +0000 Subject: fixing go build error because of go version used on build server Signed-off-by: Ondrej Kubik --- snapcraft.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index ce41bdf3..d9e7ccf0 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -130,11 +130,27 @@ parts: source: snap-src plugin: dump + go: + plugin: nil + prepare: | + gov=$(echo "$(go version | awk '{ print $3}' | sed 's/^..//') 1.7" | awk '{if ($1 < $2) print "old";}') + echo "$(go version)" + if [ "${gov}" = "old" ]; then \ + echo "updating to new go"; \ + curl https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz -o go1.9.2.linux-amd64.tar.gz; \ + tar -xvf go1.9.2.linux-amd64.tar.gz; \ + rm -rf /usr/lib/go; \ + mv go /usr/lib/; \ + ln -sf ../lib/go/bin/go /usr/bin/go; \ + fi + caddy: plugin: go go-importpath: github.com/mholt/caddy source: https://github.com/mholt/caddy.git source-type: git source-commit: 53e117802fedd5915eeb32907873d8786a4b2936 + after: + - go prime: - bin/caddy -- cgit v1.2.3-1-g7c22 From fcd7097ababeed2b396fcee23aaf76f4973a1530 Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Mon, 6 Nov 2017 10:47:50 +0000 Subject: Renaming caddy service for simplicity Signed-off-by: Ondrej Kubik --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index d9e7ccf0..aee1af8b 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -38,7 +38,7 @@ apps: daemon: simple plugs: [network, network-bind] - caddy-service: + caddy: command: caddy-control daemon: simple plugs: [network, network-bind] -- cgit v1.2.3-1-g7c22 From af82a80b2b389eb0ba3b27236e888121ba00c701 Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Fri, 9 Feb 2018 02:04:17 +0000 Subject: Using upstream caddy instead of compiling from source Signed-off-by: Ondrej Kubik --- snapcraft.yaml | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index aee1af8b..b72ecb84 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -130,27 +130,15 @@ parts: source: snap-src plugin: dump - go: - plugin: nil - prepare: | - gov=$(echo "$(go version | awk '{ print $3}' | sed 's/^..//') 1.7" | awk '{if ($1 < $2) print "old";}') - echo "$(go version)" - if [ "${gov}" = "old" ]; then \ - echo "updating to new go"; \ - curl https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz -o go1.9.2.linux-amd64.tar.gz; \ - tar -xvf go1.9.2.linux-amd64.tar.gz; \ - rm -rf /usr/lib/go; \ - mv go /usr/lib/; \ - ln -sf ../lib/go/bin/go /usr/bin/go; \ - fi - caddy: - plugin: go - go-importpath: github.com/mholt/caddy - source: https://github.com/mholt/caddy.git - source-type: git - source-commit: 53e117802fedd5915eeb32907873d8786a4b2936 - after: - - go - prime: - - bin/caddy + plugin: dump + source: https://caddyserver.com/download/linux/amd64?plugins= + source-type: tar + organize: + caddy: bin/caddy + CHANGES.txt: CADDY_CHANGES.txt + EULA.txt: CADDY_EULA.txt + LICENSES.txt: CADDY_LICENSES.txt + README.txt: CADDY_README.txt + stage: + - -init -- cgit v1.2.3-1-g7c22 From fcd83ea7bd913d41c437aa80e5e25a9fd14a7511 Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Tue, 20 Feb 2018 18:08:25 +0000 Subject: Fixing automatic review fail for snap store upload Signed-off-by: Ondrej Kubik --- snapcraft.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'snapcraft.yaml') diff --git a/snapcraft.yaml b/snapcraft.yaml index b72ecb84..d1ef6856 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -90,6 +90,7 @@ parts: - npm - curl - paxctl + - execstack prepare: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules @@ -123,6 +124,7 @@ parts: cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan + execstack --clear-execstack $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs organize: README: README.wekan -- cgit v1.2.3-1-g7c22