-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cpl/dockerfile # sh /src/v-tint2/build.sh cache; \
cpl/dockerfile RUN rm -rf /rootfs${STATIC}/tint2 cpl/dockerfile # RUN rm -rf /rootfs${STATIC}/tint2 cpl/dockerfile ARG BUILDDATE
- Loading branch information
Showing
1 changed file
with
11 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -194,7 +194,7 @@ ARG COMPILE_TINT2="yes" | |
ENV CONSOLE_LOG=no \ | ||
TARGETPATH=/usr/local/static/tint2 | ||
RUN mkdir -p $TARGETPATH; \ | ||
sh /src/v-tint2/build.sh cache; \ | ||
# sh /src/v-tint2/build.sh cache; \ | ||
\ | ||
test "yes" != "$COMPILE_TINT2" && exit 0 || echo doMake; \ | ||
sh /src/v-tint2/build.sh b_deps; \ | ||
|
@@ -293,13 +293,6 @@ RUN mkdir -p $TARGETPATH; \ | |
ARG REPO= | ||
FROM ${REPO}infrastlabs/x11-base:${COMPILE_IMG} AS ff | ||
FROM alpine:3.15 | ||
# Set multiple labels at once, author,builtdate | ||
LABEL \ | ||
github.com.infrastlabs.docker-x11base.vendor=Infrastlabs \ | ||
github.com.infrastlabs.docker-x11base.release="production" \ | ||
github.com.infrastlabs.docker-x11base.version="1.0.1-beta" \ | ||
github.com.infrastlabs.docker-x11base.maintainer="sam <[email protected]>" \ | ||
github.com.infrastlabs.docker-x11base.builtdate="$(date -u +'%Y-%m-%d %H:%M:%S')" | ||
COPY --from=ff /rootfs /rootfs | ||
RUN export domain="mirrors.ustc.edu.cn"; \ | ||
echo "http://$domain/alpine/v3.15/main" > /etc/apk/repositories; \ | ||
|
@@ -350,6 +343,8 @@ COPY --from=suckless ${STATIC} /rootfs${STATIC} | |
# | ||
COPY --from=xcompmgr ${STATIC} /rootfs${STATIC} | ||
COPY --from=xlunch ${STATIC} /rootfs${STATIC} | ||
# CARE!! dirty clear; | ||
# RUN rm -rf /rootfs${STATIC}/tint2 | ||
COPY --from=tint2 ${STATIC} /rootfs${STATIC} | ||
COPY --from=feh ${STATIC} /rootfs${STATIC} | ||
COPY --from=pcmanfm ${STATIC} /rootfs${STATIC} | ||
|
@@ -371,3 +366,11 @@ RUN find /rootfs${STATIC} -type f |sort |wc | |
RUN find /rootfs${STATIC} -type f |sort | ||
# RUN rm -rf ${STATIC}; ln -s /rootfs${STATIC} ${STATIC} | ||
|
||
# Set multiple labels at once, author,builtdate | ||
ARG BUILDDATE | ||
LABEL \ | ||
github.com.infrastlabs.docker-x11base.vendor=Infrastlabs \ | ||
github.com.infrastlabs.docker-x11base.release="production" \ | ||
github.com.infrastlabs.docker-x11base.version="1.0.1-beta" \ | ||
github.com.infrastlabs.docker-x11base.maintainer="sam <[email protected]>" \ | ||
github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE" |