Эх сурвалжийг харах

Adjust docker scripts for new make target adjustments

George S. Baugh 5 жил өмнө
parent
commit
765440723e
4 өөрчлөгдсөн 11 нэмэгдсэн , 7 устгасан
  1. 2 3
      Dockerfile
  2. 3 2
      Dockerfile.build
  3. 5 1
      Makefile
  4. 1 1
      dockerdeploy.sh

+ 2 - 3
Dockerfile

@@ -3,8 +3,6 @@ FROM troglodyne/base:latest AS tcms
 ARG port=5000
 LABEL description="tCMS: a Perl CMS by Troglodyne LLC"
 
-EXPOSE $port/tcp
-
 ADD . /home/tcms
 RUN chown -R tcms /home/tcms
 
@@ -12,4 +10,5 @@ USER tcms
 
 RUN make install
 RUN make reset-dummy-data
-CMD /usr/bin/starman -p $port www/server.psgi
+ENTRYPOINT ["/usr/bin/starman","www/server.psgi"]
+CMD ['-p',$port]

+ 3 - 2
Dockerfile.build

@@ -3,9 +3,10 @@ FROM ubuntu:latest AS base
 USER root
 RUN useradd tcms
 RUN apt-get update
-RUN apt-get install -y make apt-utils mlocate
+RUN apt-get install -y make apt-utils mlocate curl
 
 ADD ./Makefile /home/tcms/Makefile
+ADD ./Makefile.PL /home/tcms/Makefile.PL
 RUN mkdir /home/tcms/.tcms
 RUN mkdir -p /home/tcms/www/scripts
 RUN chown -R tcms /home/tcms
@@ -21,5 +22,5 @@ RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime
 RUN apt-get install -y tzdata
 RUN dpkg-reconfigure --frontend noninteractive tzdata
 
-RUN make depend
+RUN make prereq-debian
 RUN updatedb

+ 5 - 1
Makefile

@@ -22,7 +22,10 @@ reset-dummy-data:
 	cp -f data/DUMMY-dist.json data/DUMMY.json
 
 .PHONY: prereq-debian
-prereq-debian: prereq-frontend prereq-perl
+prereq-debian: prereq-debs prereq-perl prereq-frontend
+
+.PHONY: prereq-debs
+prereq-debs:
 	apt-get install -y sqlite3 libsqlite3-dev libdbd-sqlite3-perl cpanminus starman libxml2 wget                         \
 	    libtext-xslate-perl libplack-perl libconfig-tiny-perl libdatetime-format-http-perl libjson-maybexs-perl          \
 	    libuuid-tiny-perl libcapture-tiny-perl libconfig-simple-perl libdbi-perl libfile-slurper-perl libfile-touch-perl \
@@ -30,6 +33,7 @@ prereq-debian: prereq-frontend prereq-perl
 	    libmoose-perl libmoosex-types-datetime-perl libxml-libxml-perl
 
 .PHONY: prereq-perl
+prereq-perl:
 	cpanm -n --installdeps .
 
 .PHONY: prereq-frontend

+ 1 - 1
dockerdeploy.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 docker build -t troglodyne/tcms .
-docker run -dp 5000:5000 troglodyne/tcms:latest "//usr/bin/starman" "www/server.psgi"
+docker run -dp 5000:5000 troglodyne/tcms:latest