Skip to content

Commit e7551b3

Browse files
committed
added a target to build a bledding edge image
1 parent d2e04c4 commit e7551b3

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM perl:5.20
1+
FROM perl:5.24
22
MAINTAINER Siddhartha Basu <[email protected]>
33

44
ADD https://northwestern.box.com/shared/static/3n0wdp04075oyrnytznn9mzc3k9o92c1.rpm /rpms/
@@ -13,23 +13,25 @@ RUN apt-get update && \
1313
echo 'export ORACLE_HOME=/usr/lib/oracle/11.2/client64' > /etc/profile.d/oracle.sh \
1414
&& apt-get clean \
1515
&& apt-get autoremove \
16-
&& rm -rf /var/lib/apt/lists/*
16+
&& rm -rf /var/lib/apt/lists/* \
17+
&& rm -f /var/lib/dpkg/lock
1718

1819
ENV ORACLE_HOME /usr/lib/oracle/11.2/client64/
1920
ENV LD_LIBRARY_PATH /usr/lib/oracle/11.2/client64/lib/
2021

2122
ARG curruid
2223
ARG user
23-
ADD cpanfile /tmp/
24-
ADD dist.ini /tmp/
24+
ADD . /tmp/
2525
RUN cd /tmp \
2626
&& cpanm -n --quiet --installdeps . \
2727
&& cpanm -n --quiet DBD::Oracle DBD::Pg Math::Base36 String::CamelCase LWP::Protocol::https Child Dist::Zilla \
2828
&& dzil authordeps --missing | cpanm -n --quiet \
29+
&& perl Build.PL \
30+
&& ./Build install \
2931
&& rm -fr /rpms \
3032
&& rm -rf /tmp/*
3133
# Add an user that will be used for install purpose
32-
RUN useradd -m -s /bin/bash -c "Docker image user" -u $curruid $user
34+
RUN useradd -m -s /bin/bash -c "Docker image user" -u $curruid $user
3335
USER $user
3436
WORKDIR /usr/src/modware
3537

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ default: build test
1313
#upload_url = $(shell curl --silent --data '$(api_json)' https://api.github.com/repos/dictybase/modware-loader/releases/latest?access_token=$(access_token) | jq '.upload_url' | sed -e 's/{.*}//' | sed -e 's/"//g' | sed -e 's/[[:blank:]]*$$//')
1414
build:
1515
docker build --rm --build-arg user=$(shell id -nu) --build-arg curruid=$(shell id -u) -t dictybase/modware-loader-test:devel .
16+
build-bleeding:
17+
docker build --rm --build-arg user=$(shell id -nu) --build-arg curruid=$(shell id -u) -t dictybase/modware-loader:bleeding .
1618
test:
1719
docker run --rm -v $(shell pwd):/usr/src/modware -e HARNESS_OPTIONS="j6" dictybase/modware-loader-test:devel
1820
testpg:

0 commit comments

Comments
 (0)