Skip to content

fix: mksquashfs copied incorrectly #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucyllewy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: mksquashfs copied incorrectly #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@ RUN apt-get update -qq && \
# Fetch and compile squashfs-tools
RUN git clone https://github.com/plougher/squashfs-tools.git
RUN cd squashfs-tools && \
git checkout 4.5.1 && \
git checkout 4.6.1 && \
sed -Ei 's/#(XZ_SUPPORT.*)/\1/' squashfs-tools/Makefile && \
sed -Ei 's/#(LZO_SUPPORT.*)/\1/' squashfs-tools/Makefile && \
sed -Ei 's/#(LZ4_SUPPORT.*)/\1/' squashfs-tools/Makefile && \
sed -Ei 's|(INSTALL_PREFIX = ).*|\1 /usr|' squashfs-tools/Makefile && \
sed -Ei 's/\$\(INSTALL_DIR\)/$(DESTDIR)$(INSTALL_DIR)/g' squashfs-tools/Makefile && \
cd squashfs-tools && \
make -j$(nproc) && \
Expand All @@ -46,8 +45,8 @@ RUN snap download snapd
RUN unsquashfs -f -d /snap/snapd/current snapd_*.snap

# Replace mksquashfs and unsqusahfs with our own
RUN cp /usr/bin/mksquashfs /snap/snapd/current/usr/bin
RUN cp /usr/bin/unsquashfs /snap/snapd/current/usr/bin
RUN cp /usr/local/bin/mksquashfs /snap/snapd/current/usr/bin
RUN cp /usr/local/bin/unsquashfs /snap/snapd/current/usr/bin

# Repack snapd
RUN mksquashfs /snap/snapd/current /snapd.snap
Expand Down
1 change: 1 addition & 0 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,6 @@ if grep -q securityfs /proc/filesystems; then
mount -o rw,nosuid,nodev,noexec,relatime securityfs -t securityfs /sys/kernel/security
fi
mount -t tmpfs tmpfs /run
mkdir -p /run/lock
mount -t tmpfs tmpfs /run/lock
exec /lib/systemd/systemd --system --system-unit docker-exec.service