Merge branch 'master' into rebase_upstream

learningequality · Nov 7, 2024 · e2ba148 · e2ba148
2 parents f676706 + f76306c
commit e2ba148
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
+
 ARG BASE_IMAGE=debian:bullseye
 FROM ${BASE_IMAGE}
-
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -y update && \

diff --git a/config b/config
@@ -4,4 +4,4 @@ FIRST_USER_PASS='kolibrifly'
 ENABLE_SSH='1'
 HOSTNAME=kolibri
 TARGET_HOSTNAME=kolibri
-DISABLE_FIRST_BOOT_USER_RENAME=1
+DISABLE_FIRST_BOOT_USER_RENAME=1
diff --git a/stage0/00-configure-apt/files/learningequality-ubuntu-kolibri-bionic.list b/stage0/00-configure-apt/files/learningequality-ubuntu-kolibri-bionic.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/learningequality/kolibri/ubuntu bionic main
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		deb http://ppa.launchpad.net/learningequality/kolibri/ubuntu bionic main