mirror of https://github.com/JPyke3/mbp-manjaro
Compare commits
12 Commits
8434c2eb7f
...
a6ee693a41
Author | SHA1 | Date |
---|---|---|
JPyke3 | a6ee693a41 | |
JPyke3 | 9db27e2070 | |
Jacob Pyke | 6bbf3c6520 | |
JPyke3 | cfabbd0e6b | |
JPyke3 | a931b5b395 | |
JPyke3 | b15f803d0d | |
JPyke3 | 04189f94c6 | |
JPyke3 | a15f2853b5 | |
JPyke3 | 64d693aa8f | |
JPyke3 | 9cfd9ae0a6 | |
JPyke3 | 599e6bb76d | |
JPyke3 | e1d0940a7d |
|
@ -18,7 +18,4 @@ RUN [ "pacman", "-Syu", "manjaro-tools-iso-git",\
|
|||
# Import my Pacman GPG key
|
||||
RUN [ "pacman-key", "--recv-key", "2BA2DFA128BBD111034F7626C7833DB15753380A", "--keyserver", "keyserver.ubuntu.com" ]
|
||||
|
||||
# Clone the repository to the root home dir
|
||||
RUN [ "git", "clone", "https://github.com/JPyke3/mbp-manjaro", "/root/iso-profiles"]
|
||||
|
||||
ENTRYPOINT buildiso -f -p $EDITION -k $KERNEL -t /root/out
|
||||
|
|
|
@ -218,7 +218,9 @@ sudo bash -c "echo 2 > /sys/class/input/*/device/fnmode"
|
|||
### Option 1: Docker
|
||||
First, you need to ensure that docker isn't using `overlay` or `overlay2` filesystems. This can be verified by running `docker info`. And will be shown next to `Storage Driver`.
|
||||
|
||||
In the event that you are running `overlay`, [Look at this docker documentation](https://docs.docker.com/storage/storagedriver/aufs-driver/) on how to switch to AUFS.
|
||||
In the event that you are running `overlay`, [Look at this docker documentation](https://docs.docker.com/storage/storagedriver/vfs-driver/) on how to switch to VFS.
|
||||
|
||||
*Note, this doesn't work on OSX or Windows, I am working closely with the Manjaro Devs on this one.*
|
||||
|
||||
**Quick Docker Install Script - Tested on Arch**
|
||||
```
|
||||
|
@ -230,6 +232,7 @@ sh -c "$(curl -fsSL "https://raw.githubusercontent.com/JPyke3/mbp-manjaro/master
|
|||
```
|
||||
docker run --privileged \
|
||||
-v ~/manjaro-mbp-iso:/root/out \
|
||||
-v {PATH-TO-REPO}:/root/iso-profiles\
|
||||
--env KERNEL=linux57-mbp\
|
||||
--env EDITION=gnome\
|
||||
jpyke3/mbp-manjaro-buildiso
|
||||
|
@ -240,6 +243,7 @@ docker run --privileged \
|
|||
- This is required for allowing the filesystems to be created. (This is a security risk! Read for yourself the documentation on this flag)
|
||||
- `-v`
|
||||
- Create a folder on your host filesystem to retrieve the compiled files from the container
|
||||
- Ensure that `{PATH-TO-REPO}` is replaced by the absolute path to this repo's files.
|
||||
- `--env`
|
||||
- There are two environment variables:
|
||||
- `KERNEL`: This is used for defining which kernel version to use. All packages will follow the `-mbp` naming scheme.
|
||||
|
@ -323,5 +327,5 @@ Arch MBP 2018 (Out of Date): https://gist.github.com/TRPB/437f663b545d23cc8a2073
|
|||
- [x] xfce
|
||||
- [x] GNOME
|
||||
- [ ] KDE-Plasma
|
||||
- [ ] Cinnamon
|
||||
- [x] Cinnamon
|
||||
- [ ] Budige
|
||||
|
|
|
@ -0,0 +1,30 @@
|
|||
#!/bin/bash
|
||||
|
||||
# docker run --privileged --mount type=bind,source="$HOME"/manjaro-mbp-iso,target=/root/out \
|
||||
# -v ~/tmp/buildiso:/var/lib/manjaro-tools/buildiso --env KERNEL=linux57-mbp\
|
||||
# --env EDITION=gnome\
|
||||
# jpyke3/mbp-manjaro-buildiso
|
||||
|
||||
for f in ../manjaro/*; do
|
||||
if [ -d "$f" ]; then
|
||||
e=$(echo -e "$f" | sed 's/\.\.\/manjaro\///')
|
||||
# Make out directory
|
||||
mkdir -p ~/mbp-manjaro/out/"$e"
|
||||
# Run the container
|
||||
docker run --privileged -v $PWD/../:/root/iso-profiles -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso:dev
|
||||
# Clean docker system
|
||||
docker system prune -f
|
||||
fi
|
||||
done
|
||||
|
||||
for f in ../community/*; do
|
||||
if [ -d "$f" ]; then
|
||||
e=$(echo -e "$f" | sed 's/\.\.\/community\///')
|
||||
# Make out directory
|
||||
mkdir -p ~/mbp-manjaro/out/"$e"
|
||||
# Run the container
|
||||
docker run --privileged -v $PWD/../:/root/iso-profiles -v ~/mbp-manjaro/out/"$e":/root/out --env KERNEL=linux57-mbp --env EDITION="$e" jpyke3/mbp-manjaro-buildiso:dev
|
||||
# Clean docker system
|
||||
docker system prune -f
|
||||
fi
|
||||
done
|
|
@ -1,3 +1,3 @@
|
|||
[mbp]
|
||||
SigLevel = Optional TrustAll
|
||||
SigLevel = Never
|
||||
Server = https://jacobpyke.xyz/archlinux/$repo/$arch
|
||||
|
|
Loading…
Reference in New Issue