Skip to content

Commit

Permalink
separate apt registration
Browse files Browse the repository at this point in the history
also bump version number
  • Loading branch information
CGDogan committed Aug 22, 2023
1 parent 2a24a76 commit a79bcb7
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
17 changes: 3 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,8 @@ RUN ./install_openjpeg.sh
WORKDIR /root/src
RUN ./install_openslide.sh

## build dummy apt packages
RUN mkdir equivs
RUN cd equivs
ADD libopenslide0 .

# libopenslide0
RUN equivs-build libopenslide0
RUN dpkg -i libopenslide0_3.4.2_all.deb

# libopenslide-dev
RUN sed -i 's/libopenslide0/libopenslide-dev/g' libopenslide0
RUN mv libopenslide0 libopenslide-dev
RUN equivs-build libopenslide-dev
RUN dpkg -i libopenslide-dev_3.4.2_all.deb
## Install dummy apt packages against competitor versions being installed
WORKDIR /root/src
RUN ./register_openslide_apt.sh

WORKDIR /
4 changes: 4 additions & 0 deletions install_openslide.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ set -x

# Use the main branch until we have a release with DICOM
# otherwise: --branch=v3.4.1, etc.
# IMPORTANT NOTE: If we're building OpenSlide instead of installing from apt-get
# whenever the version in meson.build in OpenSlide source code is updated,
# the version in our files "libopenslide0" and "register_openslide_apt.sh"
# needs to be updated to be a greater version number (or equal)
git clone https://github.com/openslide/openslide.git --branch=main --depth=1
cd openslide

Expand Down
2 changes: 1 addition & 1 deletion libopenslide0
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Priority: optional
Standards-Version: 3.9.2

Package: libopenslide0
Version: 3.4.2
Version: 4.1.0
Description: dummy package to disallow conflicting ones from apt
16 changes: 16 additions & 0 deletions register_openslide_apt.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# To see where, if it fails
set -x

mkdir equivs
cd equivs
cp ../libopenslide0 .

# libopenslide0
equivs-build libopenslide0
dpkg -i libopenslide0_4.1.0_all.deb

# libopenslide-dev
sed -i 's/libopenslide0/libopenslide-dev/g' libopenslide0
mv libopenslide0 libopenslide-dev
equivs-build libopenslide-dev
dpkg -i libopenslide-dev_4.1.0_all.deb

0 comments on commit a79bcb7

Please sign in to comment.