From 1347b4c34eaf55c3ab665d32ed0621375a7c9e45 Mon Sep 17 00:00:00 2001 From: Keith Avery Date: Mon, 14 Aug 2023 09:36:21 -0400 Subject: [PATCH 1/3] chore(url): change link to the 1898 hosted repo --- Dockerfile.dapper | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index ed5c870..862efbf 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -7,23 +7,23 @@ ARG LINUX_SOURCE=linux-source-5.0.0=5.0.0-47.51~18.04.1 ENV DEBIAN_FRONTEND=noninteractive RUN set -x \ - && apt-get --assume-yes update \ - && apt-get --assume-yes download \ + && apt-get --assume-yes update \ + && apt-get --assume-yes download \ ${LINUX_FIRMWARE} \ ${LINUX_SOURCE} \ - && mkdir -vp ${DOWNLOADS} \ - && mv -vf linux-firmware* ${DOWNLOADS}/ubuntu-firmware.deb \ - && mv -vf linux-source* ${DOWNLOADS}/ubuntu-kernel.deb + && mkdir -vp ${DOWNLOADS} \ + && mv -vf linux-firmware* ${DOWNLOADS}/ubuntu-firmware.deb \ + && mv -vf linux-source* ${DOWNLOADS}/ubuntu-kernel.deb FROM ${APT_GCC} ARG DOWNLOADS=/usr/src/downloads # Wireguard support, included in Linux in 5.6+ -ARG WG_URL="https://git.zx2c4.com" +ARG WG_URL="https://github.com/1898andCo/" ARG WG_REPO="wireguard-linux-compat" -ARG WG_TAG=v1.0.20200413 +ARG WG_TAG=v1.0.20220627 COPY --from=bionic ${DOWNLOADS}/ ${DOWNLOADS}/ RUN apt-get update \ - && apt-get install -y \ + && apt-get install -y \ kernel-wedge \ libncurses-dev \ fakeroot \ @@ -41,7 +41,7 @@ RUN apt-get update \ gawk \ libudev-dev \ pciutils-dev \ - && rm -f /bin/sh && ln -s /bin/bash /bin/sh + && rm -f /bin/sh && ln -s /bin/bash /bin/sh ########## Dapper Configuration ##################### From 982a5ea8aacb881faef5dd56077c39f1e3533cd6 Mon Sep 17 00:00:00 2001 From: Keith Avery Date: Mon, 14 Aug 2023 13:22:56 -0400 Subject: [PATCH 2/3] chore(doc): fixed link in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26fe5f2..b0d7d15 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This repo can build the kernel and package the firmware. # License Copyright (c) 2019-2020 [Rancher Labs, Inc.](http://rancher.com) -Copyright (c) 2023 [1898 & Co](http://1898andco.com) +Copyright (c) 2023 [1898 & Co](http://1898andco..burnsmcd.com) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From c403eb577e15320d855dc7cecf3525bb6e5f2e58 Mon Sep 17 00:00:00 2001 From: Keith Avery Date: Mon, 21 Aug 2023 08:54:20 -0400 Subject: [PATCH 3/3] chore(libs): update and specify library versions in dapper --- Dockerfile.dapper | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 862efbf..28540fa 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -24,25 +24,24 @@ ARG WG_TAG=v1.0.20220627 COPY --from=bionic ${DOWNLOADS}/ ${DOWNLOADS}/ RUN apt-get update \ && apt-get install -y \ - kernel-wedge \ - libncurses-dev \ - fakeroot \ - cpio \ - bison \ - flex \ - ccache \ - vim \ - gnupg2 \ - locales \ - bc \ - kmod \ - libelf-dev \ - rsync \ - gawk \ - libudev-dev \ - pciutils-dev \ + kernel-wedge=2.99 \ + libncurses-dev=6.1+20181013-2+deb10u3 \ + fakeroot=1.23-1 \ + cpio\ + bison=2:3.3.2.dfsg-1 \ + flex=2.6.4-6.2 \ + ccache=3.6-1 \ + vim=2:8.1.0875-5+deb10u5 \ + gnupg2=2.2.12-1+deb10u2 \ + locales=2.28-10+deb10u2 \ + bc=1.07.1-2+b1\ + kmod=26-1 \ + libelf-dev=0.176-1.1 \ + rsync=3.1.3-6 \ + gawk=1:4.2.1+dfsg-1 \ + libudev-dev=241-7~deb10u10 \ + pciutils-dev \ && rm -f /bin/sh && ln -s /bin/bash /bin/sh - ########## Dapper Configuration ##################### ENV DAPPER_ENV VERSION DEBUG