Skip to content

Commit b8c6c28

Browse files
hromagnumoubiwann
authored andcommittedOct 8, 2016
Updated Dockerfile copy.
1 parent 9022a78 commit b8c6c28

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ pom.xml.asc
1111
.lein-plugins/
1212
.lein-failures
1313
.nrepl-port
14+
test/local-travis/src/*

‎dev-resources/make/test.mk

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ local-travis-check-no-lint:
2525
bash ./test/local-travis/check.sh
2626
bash ./test/travis-no-lint.sh
2727

28+
local-travis: TEST_DIR = ./test/local-travis
29+
local-travis: TAG = meson/test
2830
local-travis:
29-
bash ./test/local-travis/setup.sh
30-
docker build -t meson/test ./test/local-travis
31-
docker run -t meson/test
31+
cp -r src $(TEST_DIR)/
32+
bash $(TEST_DIR)/setup.sh
33+
docker build -t $(TAG) $(TEST_DIR)/
34+
docker run -t $(TAG)

‎test/local-travis/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ENV MESON /home/travis/builds/meson
4444
ENV LEIN_ROOT true
4545

4646
# XXX before merge, remove next line
47-
RUN echo "cache bust!!!!!"
47+
RUN echo "cache bust!!!!!!"
4848
RUN echo "\n\n*** Clone Meson repo ***\n\n"
4949
RUN cd $BUILDS && \
5050
git clone https://github.com/clojusc/meson.git
@@ -62,5 +62,5 @@ RUN cd $MESON && \
6262
$MESON/test/local-travis/guest-cmd-prep.sh
6363

6464
# Copy latest code into the image
65-
COPY srs/meson/* $MESON/src/meson/
65+
COPY src/meson/* $MESON/src/meson/
6666
CMD "$MESON/test/local-travis/guest-cmd.sh"

0 commit comments

Comments
 (0)
Please sign in to comment.