Dockerfile: Save original git describe as well, fixed dockerignore

includeos · Oct 2, 2018 · 9ba16d1 · 9ba16d1
1 parent c651325
commit 9ba16d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,8 +1,3 @@
 build_*
 IncludeOS_install/
-diskimagebuild/build
-vmbuild/build
-src/chainload/build
-test/
-examples/
 **/build
diff --git a/Dockerfile b/Dockerfile
@@ -45,7 +45,8 @@ COPY . .
 
 # Ability to specify custom tag that overwrites any existing tag. This will then match the reported IncludeOS version
 ARG TAG
-RUN : ${TAG:=$(git describe --tags)} && git tag -d $(git describe --tags); git tag $TAG && git describe --tags --dirty > /ios_version.txt
+RUN git describe --tags --dirty > /ios_version.txt
+RUN : ${TAG:=$(git describe --tags)} && git tag -d $(git describe --tags); git tag $TAG && git describe --tags --dirty > /tag.txt
 
 # Installation
 RUN ./install.sh -n
@@ -85,6 +86,7 @@ COPY --from=source-build  /root/IncludeOS/etc/install_dependencies_linux.sh /
 COPY --from=source-build  /root/IncludeOS/etc/use_clang_version.sh /
 COPY --from=source-build  /root/IncludeOS/lib/uplink/starbase /root/IncludeOS/lib/uplink/starbase/
 COPY --from=source-build  /ios_version.txt /
+COPY --from=source-build  /tag.txt /
 COPY --from=source-build  /root/IncludeOS/etc/docker_entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]