Skip to content

Commit 1ffb739

Browse files
authored
Merge pull request #428 from metrue/master
release v0.8.81
2 parents 1b6f14a + 8c0182b commit 1ffb739

11 files changed

Lines changed: 28 additions & 21 deletions

File tree

‎.github/workflows/docker.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
docker build -t metrue/fx-d-base:latest -f ./assets/dockerfiles/base/d/Dockerfile ./assets/dockerfiles/base/d
3636
docker push metrue/fx-d-base:latest
3737
38-
# - name: build and publish fx java image
39-
# run: |
40-
# docker build -t metrue/fx-go-base:latest -f ./assets/dockerfiles/base/java/Dockerfile ./assets/dockerfiles/base/java
41-
# docker push metrue/fx-java-base:latest
38+
- name: build and publish fx go image
39+
run: |
40+
docker build -t metrue/fx-go-base:latest -f ./assets/dockerfiles/base/go/Dockerfile ./assets/dockerfiles/base/go
41+
docker push metrue/fx-go-base:latest
4242
4343
- name: build and publish fx node image
4444
if: always()
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM golang:latest
2+
3+
# dependency management
4+
RUN go get github.com/gin-gonic/gin
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM alpine:3.4
2+
MAINTAINER Mojolicious
3+
4+
ADD . .
5+
COPY cpanfile /
6+
ENV EV_EXTRA_DEFS -DEV_NO_ATFORK
7+
8+
RUN apk update && \
9+
apk add perl perl-io-socket-ssl perl-dbd-pg perl-dev g++ make wget curl && \
10+
curl -L https://cpanmin.us | perl - App::cpanminus && cpanm --installdeps . -M https://cpan.metacpan.org
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM ruby:latest
2+
3+
RUN gem install sinatra

‎fx.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/urfave/cli"
1717
)
1818

19-
const version = "0.8.79"
19+
const version = "0.8.81"
2020

2121
func init() {
2222
go checkForUpdate()

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/gorilla/mux v1.7.3 // indirect
2323
github.com/imdario/mergo v0.3.7 // indirect
2424
github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434
25-
github.com/metrue/go-ssh-client v0.0.0-20191209160027-5773243a8bc9
25+
github.com/metrue/go-ssh-client v0.0.0-20191219103445-1f07b67e2b29
2626
github.com/mholt/archiver v3.1.1+incompatible
2727
github.com/mitchellh/go-homedir v1.1.0
2828
github.com/morikuni/aec v1.0.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ github.com/metrue/go-ssh-client v0.0.0-20191125030649-4ac058ee958b h1:JGD0sJ44Xz
200200
github.com/metrue/go-ssh-client v0.0.0-20191125030649-4ac058ee958b/go.mod h1:ERHOEBrDy6+8vfoJjjmhdmBpOzdvvP7bLtwYTTK6LOs=
201201
github.com/metrue/go-ssh-client v0.0.0-20191209160027-5773243a8bc9 h1:HHfMhG77ZLn3FOH3AGXW/F5RpAABVH6Fr5mVZZ97S6w=
202202
github.com/metrue/go-ssh-client v0.0.0-20191209160027-5773243a8bc9/go.mod h1:aPG/JtXTyLliKDDlkv+nzHbSbz2p2CBMAjNJRK4uhzY=
203+
github.com/metrue/go-ssh-client v0.0.0-20191219103445-1f07b67e2b29 h1:ENoMPMVc24XbBuVZ7guZmTB/7MSd+vqOkImSu9UUiJw=
204+
github.com/metrue/go-ssh-client v0.0.0-20191219103445-1f07b67e2b29/go.mod h1:aPG/JtXTyLliKDDlkv+nzHbSbz2p2CBMAjNJRK4uhzY=
203205
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
204206
github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
205207
github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=

‎packer/images/go/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
FROM golang:latest
1+
FROM metrue/fx-go-base
22

33
COPY . /go/src/github.com/metrue/fx
44
WORKDIR /go/src/github.com/metrue/fx
55

6-
# dependency management
7-
RUN go get github.com/gin-gonic/gin
8-
96
RUN go build -ldflags "-w -s" -o fx fx.go app.go
107

118
EXPOSE 3000

‎packer/images/perl/Dockerfile‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
FROM alpine:3.4
2-
MAINTAINER Mojolicious
1+
FROM metrue/fx-perl-base
32

43
ADD . .
5-
COPY cpanfile /
6-
ENV EV_EXTRA_DEFS -DEV_NO_ATFORK
7-
8-
RUN apk update && \
9-
apk add perl perl-io-socket-ssl perl-dbd-pg perl-dev g++ make wget curl && \
10-
curl -L https://cpanmin.us | perl - App::cpanminus && cpanm --installdeps . -M https://cpan.metacpan.org
114

125
EXPOSE 3000
136
CMD ["perl", "app.pl", "daemon"]

0 commit comments

Comments
 (0)
⌂ 换网址