Skip to content

Commit

Permalink
Fix the -dirty flag on the reported version when building with Docker
Browse files Browse the repository at this point in the history
Update .gitignore and .dockerignore to avoid the build being reported
as dirty.

Remove the redundant git PPA apt repository from the list.
  • Loading branch information
kjsanger committed Sep 4, 2024
1 parent 4ca6649 commit c83c2db
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
11 changes: 0 additions & 11 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,12 +1 @@
.dockerignore
.DS_Store
.env
.github
.gitignore
.vscode
ChangeLog
COPYING
docker-compose.yml
Dockerfile
INSTALL
README.md
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
*.l[oa]
*.log
*~
.DS_Store
.devcontainer
.env
.idea
.vscode
*.cache
*.dSYM
.deps
.libs
doc/_build
tests/*.trs
ar-lib
compile
config.*
Expand All @@ -25,6 +28,11 @@ GRTAGS
GTAGS
aclocal.m4
configure
ub-*-baton-irods-*
Makefile
doc/Makefile
doc/_build
doc/baton.1
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
Expand All @@ -37,3 +45,5 @@ src/baton-metamod
src/baton-metaquery
src/baton-metasuper
src/baton-specificquery
tests/*.trs
tests/Makefile
4 changes: 0 additions & 4 deletions release/ubuntu/22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ RUN apt-get update && \
irods-dev="${IRODS_VERSION}-0~$(lsb_release -sc)" \
irods-runtime="${IRODS_VERSION}-0~$(lsb_release -sc)"

RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys "E1DD270288B4E6030699E45FA1715D88E1DF1F24" && \
echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu $(lsb_release -sc) main" |\
tee /etc/apt/sources.list.d/git-core.list

RUN apt-get update && \
apt-get install -q -y --no-install-recommends \
autoconf \
Expand Down

0 comments on commit c83c2db

Please sign in to comment.