jimzah/dendrite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dockerfile

Browse Source
This commit is contained in:
Neil Alexander 2020-02-20 13:54:50 +00:00
parent 5caae6f3a0
commit 0352f250b8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/Dockerfile
View File

@ -1,8 +1,4 @@
<<<<<<< HEAD
FROM docker.io/golang:1.13.7-alpine3.11 FROM docker.io/golang:1.13.7-alpine3.11
=======
FROM docker.io/golang:1.13.6-alpine
>>>>>>> master
RUN mkdir /build RUN mkdir /build