summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-11-04 18:59:22 -0800
committerMichael Forney <mforney@mforney.org>2019-11-04 19:01:18 -0800
commit09cb647879b12dd8fee8a220dc2609e55bb0731d (patch)
tree966d1514fe496bd67df89d8f1d7f6be16b48601d
parente41789f435b31a4fd143f784b189317bfcb6bac4 (diff)
Remove unused Dockerfile
-rw-r--r--.dockerignore3
-rw-r--r--Dockerfile25
-rw-r--r--docker/config.lua14
-rw-r--r--docker/etc/.perms2
-rw-r--r--docker/etc/doas.conf2
-rw-r--r--docker/etc/group9
-rw-r--r--docker/etc/kshrc1
-rw-r--r--docker/etc/passwd4
-rw-r--r--docker/etc/profile14
-rw-r--r--docker/etc/shadow4
l---------docker/etc/ssl/cert.pem1
-rw-r--r--docker/etc/velox.conf78
12 files changed, 0 insertions, 157 deletions
diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 50f05024..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-out
-pkg/**/src
-pkg/**/fetch
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 2d9b9f62..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM alpine:edge
-RUN apk add --no-cache alpine-sdk bison libarchive-tools linux-headers lua5.2 nasm ncurses ninja tzdata wayland-dev
-
-COPY . /oasis
-WORKDIR oasis
-COPY docker/config.lua .
-
-ENV PATH $PATH:/oasis/out/pkg/texi2mdoc
-ENV PAXREAD bsdtar -xf -
-RUN git config --global user.name oasis && \
- git config --global user.email oasis && \
- lua5.2 ./setup.lua && \
- ninja out/pkg/texi2mdoc/texi2mdoc && \
- ninja && \
- git -C out/root.git --work-tree=$PWD read-tree -u --prefix=root/ tree
-
-FROM scratch
-COPY --from=0 /oasis/root /
-COPY docker/etc /etc
-RUN /libexec/applyperms -d / && \
- /libexec/applyperms -d /etc && \
- makewhatis /share/man
-
-ENV XDG_RUNTIME_DIR /tmp
-CMD ksh -l
diff --git a/docker/config.lua b/docker/config.lua
deleted file mode 100644
index de182243..00000000
--- a/docker/config.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local sets = dofile 'sets.lua'
-return {
- builddir='out',
- fs={
- {
- sets.core, sets.extra, sets.desktop, sets.devel, sets.media,
- exclude={'^include/', '^lib/.*%.a$'},
- },
- },
- target={toolchain='default', cflags='-O2 -pipe -U _FORTIFY_SOURCE', ldflags='-s -static', pie=true},
- host={toolchain='default', cflags='-O2 -pipe', ldflags='-s'},
- repo={path='$builddir/root.git', flags='--bare', tag='tree', branch='oasis'},
- video_drivers={intel=true, nouveau=true},
-}
diff --git a/docker/etc/.perms b/docker/etc/.perms
deleted file mode 100644
index b3a7ace3..00000000
--- a/docker/etc/.perms
+++ /dev/null
@@ -1,2 +0,0 @@
-100400 doas.conf
-100600 shadow
diff --git a/docker/etc/doas.conf b/docker/etc/doas.conf
deleted file mode 100644
index 94f9d212..00000000
--- a/docker/etc/doas.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-permit persist setenv { ENV=/etc/kshrc PERP_BASE=/etc/perp PS1 SSH_CONNECTION } :admin
-permit nopass keepenv root
diff --git a/docker/etc/group b/docker/etc/group
deleted file mode 100644
index a8ee5020..00000000
--- a/docker/etc/group
+++ /dev/null
@@ -1,9 +0,0 @@
-root:x:0:root
-admin:x:1:root
-tty:x:2:
-disk:x:3:
-audio:x:4:
-video:x:5:
-log:x:100:
-sshd:x:101:
-ntpd:x:102:
diff --git a/docker/etc/kshrc b/docker/etc/kshrc
deleted file mode 100644
index e69a9934..00000000
--- a/docker/etc/kshrc
+++ /dev/null
@@ -1 +0,0 @@
-set -o emacs
diff --git a/docker/etc/passwd b/docker/etc/passwd
deleted file mode 100644
index 33d57b92..00000000
--- a/docker/etc/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-root:x:0:0:root:/root:/bin/ksh
-log:x:100:100:Logging daemon:/var/empty:/bin/false
-sshd:x:101:101:SSH daemon:/var/empty:/bin/false
-ntpd:x:102:102:NTP daemon:/var/empty:/bin/false
diff --git a/docker/etc/profile b/docker/etc/profile
deleted file mode 100644
index c9afc479..00000000
--- a/docker/etc/profile
+++ /dev/null
@@ -1,14 +0,0 @@
-umask 022
-
-export ENV=/etc/kshrc
-export PATH=/bin
-export MANPATH=/share/man
-export PERP_BASE=/etc/perp
-export PAGER=less
-export EDITOR=vis
-export PS1='\$ '
-export XDG_RUNTIME_DIR=/tmp
-
-if [ -n "$SSH_CONNECTION" ] ; then
- PS1=$(hostname)$PS1
-fi
diff --git a/docker/etc/shadow b/docker/etc/shadow
deleted file mode 100644
index 4188f817..00000000
--- a/docker/etc/shadow
+++ /dev/null
@@ -1,4 +0,0 @@
-root::::::::
-log:!:::::::
-sshd:!:::::::
-ntpd:!:::::::
diff --git a/docker/etc/ssl/cert.pem b/docker/etc/ssl/cert.pem
deleted file mode 120000
index e415619e..00000000
--- a/docker/etc/ssl/cert.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../share/libressl/cert.pem \ No newline at end of file
diff --git a/docker/etc/velox.conf b/docker/etc/velox.conf
deleted file mode 100644
index 100f6ee8..00000000
--- a/docker/etc/velox.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-# velox.conf
-
-# property value
-set mod logo
-set window.border_color_active 0xff338833
-set window.border_color_inactive 0xff888888
-set window.border_width 2
-
-set tag.1.name 1
-set tag.2.name 2
-set tag.3.name 3
-set tag.4.name 4
-set tag.5.name 5
-set tag.6.name 6
-set tag.7.name 7
-set tag.8.name 8
-set tag.9.name 9
-
-# name type arguments
-action spawn_terminal spawn exec st
-action spawn_run spawn exec dmenu_run -b
-action spawn_browser spawn exec netsurf
-
-# key modifiers action
-key j mod focus_next
-key k mod focus_prev
-key Return mod zoom
-key space mod layout_next
-key Tab mod previous_tags
-key q mod,shift quit
-
-key g mod window.switch_layer
-key c mod,shift window.close
-
-key h mod tall.decrease_master_size
-key l mod tall.increase_master_size
-key h mod,shift tall.increase_num_masters
-key l mod,shift tall.decrease_num_masters
-key h mod,ctrl tall.increase_num_columns
-key l mod,ctrl tall.decrease_num_columns
-
-key Return mod,shift spawn_terminal
-key r mod spawn_run
-key b mod spawn_browser
-
-key 1 mod tag.1.activate
-key 2 mod tag.2.activate
-key 3 mod tag.3.activate
-key 4 mod tag.4.activate
-key 5 mod tag.5.activate
-key 6 mod tag.6.activate
-key 7 mod tag.7.activate
-key 8 mod tag.8.activate
-key 9 mod tag.9.activate
-
-key 1 mod,ctrl tag.1.toggle
-key 2 mod,ctrl tag.2.toggle
-key 3 mod,ctrl tag.3.toggle
-key 4 mod,ctrl tag.4.toggle
-key 5 mod,ctrl tag.5.toggle
-key 6 mod,ctrl tag.6.toggle
-key 7 mod,ctrl tag.7.toggle
-key 8 mod,ctrl tag.8.toggle
-key 9 mod,ctrl tag.9.toggle
-
-key 1 mod,shift tag.1.apply
-key 2 mod,shift tag.2.apply
-key 3 mod,shift tag.3.apply
-key 4 mod,shift tag.4.apply
-key 5 mod,shift tag.5.apply
-key 6 mod,shift tag.6.apply
-key 7 mod,shift tag.7.apply
-key 8 mod,shift tag.8.apply
-key 9 mod,shift tag.9.apply
-
-button left mod window.begin_move:window.end_move
-button left mod,shift window.begin_resize:window.end_resize
-