Skip to content

Commit 15a38b1

Browse files
author
root
committed
fix up dockerfile for dockerhub bug
1 parent e026e42 commit 15a38b1

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

Dockerfile

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
FROM scratch
22
MAINTAINER akerl <[email protected]>
3-
ENV DUCKTAPE_VERSION 0.3.2
4-
ADD shim/shim /.shim
5-
ADD cert /.cert
6-
ADD https://github.com/dock0/ducktape/releases/download/$DUCKTAPE_VERSION/ducktape /.ducktape
7-
RUN ["/.shim", ""]
8-
RUN ["/.ducktape", "https://github.com/dock0/arch/releases/download/0.0.113/root.tar.bz2"]
3+
ENV DUCKTAPE_VERSION 0.4.0
4+
ENV ROOTFS_VERSION 0.0.113
5+
ENV DUCKTAPE_URL https://github.com/dock0/arch/releases/download/$ROOTFS_VERSION/root.tar.bz2
6+
ADD shim/shim /tmp/ducktape/shim
7+
ADD cert /tmp/ducktape/cert
8+
ADD https://github.com/dock0/ducktape/releases/download/$DUCKTAPE_VERSION/ducktape /tmp/ducktape/ducktape
9+
RUN ["/tmp/ducktape/shim", ""]
10+
RUN ["/tmp/ducktape/ducktape", "https://github.com/dock0/arch/releases/download/0.0.113/root.tar.bz2"]
911
RUN pacman -Syu --needed --noconfirm git iproute2 iputils procps-ng tar which licenses util-linux
1012
CMD ["/bin/bash"]

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ shim:
2929

3030
push:
3131
@echo $$(sed -r 's/[0-9]+$$//' version)$$(($$(sed -r 's/.*\.//' version) + 1)) > version
32-
sed -i "s|download/[0-9.]*/root|download/$$(cat version)/root|" Dockerfile
32+
sed -i "s|^ENV ROOTFS_VERSION .*|ENV ROOTFS_VERSION $$(cat version)|" Dockerfile
3333
git commit -am "$$(cat version)"
3434
ssh -oStrictHostKeyChecking=no [email protected] &>/dev/null || true
3535
git tag -f "$$(cat version)"

shim/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <sys/stat.h>
22

33
int main() {
4-
chmod("/.ducktape", S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
4+
chmod("/tmp/ducktape/ducktape", S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
55
return 0;
66
}

shim/shim

32 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)