github/docker-labs
1
0
Fork 0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-14 18:27:25 +08:00
Code Issues Releases Wiki Activity

Fix session config for docker image

Browse Source
This commit is contained in:
Marcos Lilljedahl 2016-11-14 22:08:53 -03:00
parent 6a0e07aeec
commit e8d69d6a21
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile.run
View File

@ -2,10 +2,10 @@ FROM alpine
RUN apk --update add ca-certificates RUN apk --update add ca-certificates
ADD play-with-docker /bin/play-with-docker ADD play-with-docker /app/play-with-docker
COPY ./www /bin/www COPY ./www /app/www
WORKDIR /bin WORKDIR /app
CMD ["play-with-docker"] CMD ["./play-with-docker"]
EXPOSE 3000 EXPOSE 3000

2
handlers/new_instance.go
View File

@ -25,6 +25,8 @@ func NewInstance(rw http.ResponseWriter, req *http.Request) {
i, err := services.NewInstance(s) i, err := services.NewInstance(s)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
rw.WriteHeader(http.StatusInternalServerError)
return
//TODO: Set a status error //TODO: Set a status error
} else { } else {
json.NewEncoder(rw).Encode(i) json.NewEncoder(rw).Encode(i)

3
services/instance.go
View File

@ -66,6 +66,9 @@ func NewInstance(session *Session) (*Instance, error) {
rw.Lock() rw.Lock()
err = saveSessionsToDisk() err = saveSessionsToDisk()
rw.Unlock() rw.Unlock()
if err != nil {
return nil, err
}
wsServer.BroadcastTo(session.Id, "new instance", instance.Name, instance.IP, instance.Hostname) wsServer.BroadcastTo(session.Id, "new instance", instance.Name, instance.IP, instance.Hostname)

4
services/session.go
View File

@ -116,7 +116,7 @@ func GetSession(sessionId string) *Session {
} }
func LoadSessionsFromDisk() error { func LoadSessionsFromDisk() error {
file, err := os.Open("./sessions.gob") file, err := os.Open("./pwd/sessions.gob")
if err == nil { if err == nil {
decoder := gob.NewDecoder(file) decoder := gob.NewDecoder(file)
err = decoder.Decode(&sessions) err = decoder.Decode(&sessions)
@ -126,7 +126,7 @@ func LoadSessionsFromDisk() error {
} }
func saveSessionsToDisk() error { func saveSessionsToDisk() error {
file, err := os.Create("./sessions.gob") file, err := os.Create("./pwd/sessions.gob")
if err == nil { if err == nil {
encoder := gob.NewEncoder(file) encoder := gob.NewEncoder(file)
err = encoder.Encode(&sessions) err = encoder.Encode(&sessions)