flywithu/openwrt-builder.docker
1
0
Fork 0
mirror of https://github.com/cusspvz/openwrt-builder.docker synced 2025-07-11 16:38:35 +00:00
Code Issues Releases Wiki Activity

fix: prepare for travis builds

Browse Source
This commit is contained in:
José Moreira 2018-09-10 02:00:24 +01:00
parent a2f0d20e16
commit 760b525481
5 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base-image/Dockerfile
View File

@ -18,7 +18,7 @@ RUN echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/so
ADD entrypoint.sh /entrypoint ADD entrypoint.sh /entrypoint
RUN chmod 755 /entrypoint RUN chmod 755 /entrypoint
RUN mkdir -p /src /output RUN mkdir -p /src /output /overlay /repositories /feeds
WORKDIR /src WORKDIR /src
ENTRYPOINT ["/entrypoint"] ENTRYPOINT ["/entrypoint"]
CMD ["/bin/bash"] CMD ["/bin/bash"]

6
base-image/entrypoint.sh
View File

@ -3,7 +3,13 @@
# If GOSU_USER environment variable set to something other than 0:0 (root:root), # If GOSU_USER environment variable set to something other than 0:0 (root:root),
# become user:group set within and exec command passed in args # become user:group set within and exec command passed in args
if [ "$GOSU_USER" != "0:0" ]; then if [ "$GOSU_USER" != "0:0" ]; then
echo "[OpenWRT Builder] Arranging permissions..."
chown -R $GOSU_USER /src chown -R $GOSU_USER /src
chown -R $GOSU_USER /output
[ -d /feeds ] && chown -R $GOSU_USER /feeds
[ -d /repositories ] && chown -R $GOSU_USER /repositories
[ -d /overlay ] && chown -R $GOSU_USER /overlay
# make sure a valid user exists in /etc/passwd # make sure a valid user exists in /etc/passwd
if grep "^builder:" /etc/passwd; then if grep "^builder:" /etc/passwd; then

23
image-builder/builder.sh
View File

@ -1 +1,24 @@
#!/bin/bash #!/bin/bash
PROFILE=${PROFILE}
PACKAGES=${PACKAGES}
PATH_SRC=/src
PATH_REPOSITORIES=/repositories
PATH_OVERLAY=/overlay
PATH_OUTPUT=/output
CUSTOM_REPOSITORIES=$(ls $PATH_REPOSITORIES)
CPUS=${CPUS:-2}
CLEAN=${CLEAN:-0}
## HANDLE REPOSITORYS
cp $PATH_SRC/repositories.conf $PATH_SRC/repositories.conf.default
for CUSTOM_REPOSITORY in $CUSTOM_REPOSITORIES; do
echo "src ${CUSTOM_REPOSITORY} file://${PATH_REPOSITORIES}/${CUSTOM_REPOSITORY}" >> $PATH_SRC/repositories.conf
done;
# Build image
make image \
PACKAGES="$PACKAGES" \
FILES="$PATH_OVERLAY" \
BIN_DIR="$PATH_OUTPUT"

3
package-builder/Dockerfile
View File

@ -4,6 +4,9 @@ LABEL MAINTAINER "Jose Moreira <josemoreiravarzim@gmail.com>"
ARG INSTALL_SRC ARG INSTALL_SRC
RUN /bin/bash -c "$INSTALL_SRC" RUN /bin/bash -c "$INSTALL_SRC"
# Cache packages feeds
RUN ./scripts/feeds update -a
ADD builder.sh /builder ADD builder.sh /builder
RUN chmod 755 /builder RUN chmod 755 /builder
CMD ["/builder"] CMD ["/builder"]

23
package-builder/builder.sh
View File

@ -15,7 +15,7 @@ CLEAN=${CLEAN:-0}
## HANDLE FEEDS ## HANDLE FEEDS
cp $PATH_SRC/feeds.conf.default $PATH_SRC/feeds.conf cp $PATH_SRC/feeds.conf.default $PATH_SRC/feeds.conf
for CUSTOM_FEED in $CUSTOM_FEEDS; do for CUSTOM_FEED in $CUSTOM_FEEDS; do
echo "src-link ${CUSTOM_FEED} ${PATH_FEEDS}/${CUSTOM_FEED}" >> $PATH_SRC/feeds.conf echo "src-link ${CUSTOM_FEED} file://${PATH_FEEDS}/${CUSTOM_FEED}" >> $PATH_SRC/feeds.conf
done; done;
./scripts/feeds update -a ./scripts/feeds update -a
@ -24,11 +24,24 @@ for CUSTOM_FEED in $CUSTOM_FEEDS; do
done; done;
make defconfig make defconfig
echo "- Building packages $PACKAGES..."
for PACKAGE in $PACKAGES; do COMMANDS=""
[ "$CLEAN" != "0" ] && { [ "$CLEAN" != "0" ] && {
make package/${PACKAGE}/clean for PACKAGE in $PACKAGES; do
COMMANDS="$COMMANDS package/${PACKAGE}/clean"
done
}
for PACKAGE in $PACKAGES; do
COMMANDS="$COMMANDS package/${PACKAGE}/download"
}
for PACKAGE in $PACKAGES; do
COMMANDS="$COMMANDS package/${PACKAGE}/compile"
} }
make package/${PACKAGE}/compile make -j ${CPUS} ${COMMANDS} \
done BIN_DIR="$PATH_OUTPUT"
# Move bin/packages contents to the PATH_OUTPUT
echo "- Moving built packages to output dir..."
mv -v bin/packages/* $PATH_OUTPUT