Merge pull request #57 from AbeJellinek/docker

Update Dockerfile and add Maiko as submodule

.dockerignore

@@ -0,0 +1,18 @@
+# Object files
+*.o
+# Editor backups and recovery files
+*~
+\#*#
+# build directories
+*.386-x/**
+*.386/**
+*.sparc-x/**
+*.sparc/**
+*.x86_64-x/**
+*.x86_64/**
+*.armv7l-x/**
+*.armv7l/**
+init.386/**
+# core files
+core
+*.core

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "maiko"]
+	path = maiko
+	url = https://github.com/Interlisp/maiko.git

Dockerfile

@@ -1,5 +1,24 @@
-FROM node:12-alpine
+FROM ubuntu:focal
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y build-essential clang libx11-dev
+COPY maiko /build/
+WORKDIR /build/bin
+RUN rm -rf /build/linux*
+RUN ./makeright x
+
+
+FROM ubuntu:focal
+ENV DEBIAN_FRONTEND=noninteractive
+
+EXPOSE 5900
+
+RUN apt-get update && apt-get install -y tightvncserver
+RUN mkdir /app
 WORKDIR /app
-COPY lde* /usr/locsl/bin
-RUN 
-CMD lde -g 1000z800 -d host.internal full35.sysout
+COPY basics ./
+COPY --from=0 /build/linux.x86_64/* ./
+
+RUN adduser --disabled-password --gecos "" medley
+USER medley
+ENTRYPOINT USER=medley Xvnc -geometry 1270x720 :0 & DISPLAY=:0 /app/ldex -g 1280x720 full.sysout

README_docker.md

@@ -0,0 +1,18 @@
+# Running Medley with Docker
+
+If this is your first time working with Docker, you'll want to [install it](https://docs.docker.com/get-docker/) before continuing. You'll also need a modern VNC client; [TightVNC](https://www.tightvnc.com/) works well.
+
+Next, you can either pull a prebuilt image or build from scratch:
+
+## Using a prebuilt image (recommended)
+
+1. `$ docker run -p 5900:5900 interlisp/medley`
+2. Run a VNC viewer and connect to localhost.
+
+## Building from scratch
+
+1. Pull the latest Medley repo.
+2. `$ cd medley`
+3. Pull Maiko: `$ git submodule update --init --recursive`
+4. `$ docker build . -t interlisp/medley`
+5. And then as above.