Skip to content

Commit

Permalink
Merge pull request #33 from robimarko/Rebrand
Browse files Browse the repository at this point in the history
Rebrand back to Wlanslovenija
  • Loading branch information
kostko committed Aug 17, 2018
2 parents 5225282 + 28039d2 commit 228d5ee
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion openwrt/docker/Dockerfile.runtime
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM otvorenamreza/firmware-runtime
FROM wlanslovenija/firmware-runtime
4 changes: 2 additions & 2 deletions openwrt/scripts/build
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ fi
./generate-dockerfiles ${openwrt_version} ${openwrt_target} ${openwrt_subtarget}

# Prepare docker 18.04 based buildsystem
docker build --rm -t otvorenamreza/firmware-base ${work_dir}/.
docker build --rm -t wlanslovenija/firmware-base ${work_dir}/.

# Start the building
docker build --rm -t otvorenamreza/openwrt-imagebuilder-base:${openwrt_version}_${openwrt_target}_${openwrt_subtarget} ${docker_dir}/imagebuilder_base/${openwrt_version}/${openwrt_target}/${openwrt_subtarget}/.
docker build --rm -t wlanslovenija/openwrt-imagebuilder-base:${openwrt_version}_${openwrt_target}_${openwrt_subtarget} ${docker_dir}/imagebuilder_base/${openwrt_version}/${openwrt_target}/${openwrt_subtarget}/.

# Package the builder with runtime image
./docker-build-builders ${openwrt_version} ${openwrt_target} ${openwrt_subtarget}
2 changes: 1 addition & 1 deletion openwrt/scripts/docker-build
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ cd SDK
export LC_ALL=C

# Add Wlan SI OPKG feed
echo "src-git wlansi https://github.com/robimarko/firmware-packages-opkg.git" >> feeds.conf.default
echo "src-git wlansi https://github.com/wlanslovenija/firmware-packages-opkg.git" >> feeds.conf.default

# Disable default options
echo "# CONFIG_ALL_NONSHARED is not set" >> .config
Expand Down
2 changes: 1 addition & 1 deletion openwrt/scripts/docker-build-builders
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ platform_dir="${work_dir}/openwrt"

echo "Creating runtime Docker container for ${openwrt_version} ${openwrt_target} ${openwrt_subtarget}"

docker run --rm otvorenamreza/openwrt-imagebuilder-base:${openwrt_version}_${openwrt_target}_${openwrt_subtarget} 2>/dev/null | \
docker run --rm wlanslovenija/openwrt-imagebuilder-base:${openwrt_version}_${openwrt_target}_${openwrt_subtarget} 2>/dev/null | \
docker build --rm --force-rm -t wlanslovenija/openwrt-builder:${openwrt_version}_${openwrt_target}_${openwrt_subtarget} - >/dev/null 2>/dev/null

0 comments on commit 228d5ee

Please sign in to comment.