fix: ensure we do not add two debian folders in a single package
This commit is contained in:
1 parent
3b4d101a42
commit
48357adac1
2 files changed
+3
No files matched your search
@@ -44,6 +44,8 @@ FROM builder as armhf
|
|||||||
COPY --from=amd64 /tmp /tmp
|
COPY --from=amd64 /tmp /tmp
|
||||||
COPY --from=amd64 /usr/local/share/man/man1/dokku.1 /usr/local/share/man/man1/dokku.1-generated
|
COPY --from=amd64 /usr/local/share/man/man1/dokku.1 /usr/local/share/man/man1/dokku.1-generated
|
||||||
|
|
||||||
|
RUN rm -rf /tmp/build-dokku
|
||||||
|
|
||||||
ARG PLUGIN_MAKE_TARGET
|
ARG PLUGIN_MAKE_TARGET
|
||||||
ARG DOKKU_VERSION=master
|
ARG DOKKU_VERSION=master
|
||||||
ARG DOKKU_GIT_REV
|
ARG DOKKU_GIT_REV
|
||||||
|
|||||||
@@ -49,3 +49,4 @@ endif
|
|||||||
cp debian/lintian-overrides /tmp/build-dokku/usr/share/lintian/overrides/dokku
|
cp debian/lintian-overrides /tmp/build-dokku/usr/share/lintian/overrides/dokku
|
||||||
sed -i.bak "s/^Version: .*/Version: `cat /tmp/build-dokku/var/lib/dokku/STABLE_VERSION`/g" /tmp/build-dokku/DEBIAN/control && rm /tmp/build-dokku/DEBIAN/control.bak
|
sed -i.bak "s/^Version: .*/Version: `cat /tmp/build-dokku/var/lib/dokku/STABLE_VERSION`/g" /tmp/build-dokku/DEBIAN/control && rm /tmp/build-dokku/DEBIAN/control.bak
|
||||||
dpkg-deb --build /tmp/build-dokku "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
|
dpkg-deb --build /tmp/build-dokku "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
|
||||||
|
lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
|
||||||
Reference in new issue
Block a user