an
/
mmflokati
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepare for drone

This commit is contained in:
an 2017-12-06 19:31:55 +01:00
parent 99ffde1c7f
commit 71ca00f5de
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Dockerfile
View File

@ -1,20 +1,41 @@
FROM ubuntu:16.04 FROM golang:latest
MAINTAINER Andreas Neue <an@dnix.de> MAINTAINER Andreas Neue <an@dnix.de>
RUN apt-get -y --force-yes update RUN apt-get -y --force-yes update
RUN apt-get -y --force-yes upgrade RUN apt-get -y --force-yes upgrade
RUN apt-get install -y ca-certificates #RUN apt-get install -y ca-certificates
RUN apt-get install -y fortune vim RUN apt-get install -y fortune vim
RUN apt-get clean #RUN apt-get clean
RUN mkdir /mmflokati RUN mkdir /app
ADD . /app/
WORKDIR /app
RUN go get -d code.dnix.de/an/flokatilib/...
RUN go get -d code.dnix.de/an/xlog
RUN go get -d ./...
RUN ./genversion.sh
RUN ./genbuilddate.sh
RUN go build -o mmflokati .
COPY mmflokati /mmflokati/mmflokati CMD ["/app/mmflokati"]
#FROM ubuntu:16.04
#MAINTAINER Andreas Neue <an@dnix.de>
#
#RUN apt-get -y --force-yes update
#RUN apt-get -y --force-yes upgrade
#RUN apt-get install -y ca-certificates
#RUN apt-get install -y fortune vim
#RUN apt-get clean
#
#RUN mkdir /mmflokati
#
#COPY mmflokati /mmflokati/mmflokati
#COPY newsfeeds.conf /mmflokati/newsfeeds.conf #COPY newsfeeds.conf /mmflokati/newsfeeds.conf
#COPY fortunes /mmflokati/fortunes #COPY fortunes /mmflokati/fortunes
#
ENV PATH $PATH:/mmflokati #ENV PATH $PATH:/mmflokati
#
WORKDIR /mmflokati #WORKDIR /mmflokati
#CMD [ "/mmflokati/mmflokati", "-server=irc.dnix.de:6667", "-name=Flokati", "-chan=#test", "-nsname=N", "-nspass=t0ps3cr37" ] #CMD [ "/mmflokati/mmflokati", "-server=irc.dnix.de:6667", "-name=Flokati", "-chan=#test", "-nsname=N", "-nspass=t0ps3cr37" ]

5
main.go
View File

@ -16,8 +16,6 @@ import (
"code.dnix.de/an/flokatilib/modules" "code.dnix.de/an/flokatilib/modules"
"code.dnix.de/an/xlog" "code.dnix.de/an/xlog"
"mmflokati/version"
"github.com/42wim/matterbridge/matterclient" "github.com/42wim/matterbridge/matterclient"
) )
@ -96,6 +94,5 @@ func main() {
} }
func SoftwareInfo() string { func SoftwareInfo() string {
return fmt.Sprintf("mmflokati %s-%s (built %s [%s])", version.FlokatiVersion, return fmt.Sprintf("mmflokati %s-%s (built %s [%s])", FlokatiVersion, FlokatiBuild, FlokatiBuilddate, runtime.Version())
version.FlokatiBuild, version.FlokatiBuilddate, runtime.Version())
} }