mythic-insight/legendary-doc-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Repair merge issue in Dockerfile

Browse source
This commit is contained in:
Robert Prehn 2021-06-10 15:55:03 -05:00
parent 40cdba481c
commit a208fd7ebe
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -50,11 +50,4 @@ RUN MAKE=cmake mix compile
COPY --from=asset-builder /root/app/apps/app/priv/static/ /root/app/apps/app/priv/static COPY --from=asset-builder /root/app/apps/app/priv/static/ /root/app/apps/app/priv/static
RUN mix phx.digest RUN mix phx.digest
<<<<<<< HEAD
=======
RUN script/restore-timestamps
RUN mkdir -p /root/app/priv/
>>>>>>> v2.4.7
CMD elixir --name ${NAME:=legendary}@$(hostname -f) -S mix phx.server CMD elixir --name ${NAME:=legendary}@$(hostname -f) -S mix phx.server