Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build online on basis of apps.sysout - second attempt #48

Merged
merged 8 commits into from
Feb 25, 2024
Merged

Build online on basis of apps.sysout - second attempt #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eea49bf
Second try at basing online on apps.sysout
fghalasz Feb 24, 2024
5fcbd85
Updating ONLINE-INIT for apps.sysout base
fghalasz Feb 24, 2024
e6e7fc1
More fiddling with ONLINE-INIT to adapt to apps.sysout
fghalasz Feb 24, 2024
924e4f0
2 More fiddling with ONLINE-INIT to adapt to apps.sysout
fghalasz Feb 24, 2024
2c33cb3
3 More fiddling with ONLINE-INIT to adapt to apps.sysout
fghalasz Feb 25, 2024
aa8f4a1
4 More fiddling with ONLINE-INIT to adapt to apps.sysout
fghalasz Feb 25, 2024
a427828
4 More fiddling with ONLINE-INIT to adapt to apps.sysout
fghalasz Feb 25, 2024
d56b6dd
5 More fiddling with ONLINE-INIT to adapt to apps.sysout
fghalasz Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions docker_medley/Dockerfile_medley
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,18 @@ ENV NOTEFILESSRC=${NC_INSTALLDIR}/notefiles
RUN apt-get update \
&& apt-get install -y apt-utils \
&& apt-get install -y curl \
&& apt-get install -y git
&& apt-get install -y git \
&& apt-get install -y gh

# install tigervnc server
RUN apt-get purge -y tightvncserver \
&& apt-get install -y tigervnc-standalone-server
#RUN apt-get purge -y tightvncserver \
# && apt-get install -y tigervnc-standalone-server

# install gh (github cli)
COPY gh/gh_2.14.7_linux_*.deb /tmp
RUN dpkg -i /tmp/gh_2.14.7_linux_${PLATFORM}.deb; rm /tmp/gh_2.14.7_linux_*.deb
#COPY gh/gh_2.14.7_linux_*.deb /tmp
#RUN dpkg -i /tmp/gh_2.14.7_linux_${PLATFORM}.deb; rm /tmp/gh_2.14.7_linux_*.deb



# install websockify for use with noVNC
RUN apt-get install -y websockify
Expand Down Expand Up @@ -129,19 +132,19 @@ COPY notecards ${NC_INSTALLDIR}
RUN echo ${NOTECARDS_RELEASE} ${NC_INSTALLDIR}/release.txt

# do a loadup to create the online.sysout with Notecards, Rooms, etc installed
ARG ONLINE_DIR=${MEDLEY_INSTALLDIR}/../online
RUN mkdir -p ${ONLINE_DIR}/docker_medley/loadup \
&& chown root:root ${ONLINE_DIR} \
&& chown root:root ${ONLINE_DIR}/docker_medley \
&& chown root:root ${ONLINE_DIR}/docker_medley/loadup
COPY --chown=${USER_NAME}:${USER_NAME} loadup/* ${ONLINE_DIR}/docker_medley/loadup
#ARG ONLINE_DIR=${MEDLEY_INSTALLDIR}/../online
#RUN mkdir -p ${ONLINE_DIR}/docker_medley/loadup \
# && chown root:root ${ONLINE_DIR} \
# && chown root:root ${ONLINE_DIR}/docker_medley \
# && chown root:root ${ONLINE_DIR}/docker_medley/loadup
#COPY --chown=${USER_NAME}:${USER_NAME} loadup/* ${ONLINE_DIR}/docker_medley/loadup
#
RUN Xvnc -geometry 1280x720 :0 \
& export DISPLAY=":0" \
&& PATH="$MAIKO_INSTALLDIR:$PATH" \
&& ${ONLINE_DIR}/docker_medley/loadup/loadup-online-from-full.sh \
&& cp -p ${MEDLEY_INSTALLDIR}/tmp/online.sysout ${MEDLEY_INSTALLDIR}/loadups/full.sysout \
&& rm -rf ${ONLINE_DIR}/docker_medley/loadup
#RUN Xvnc -geometry 1280x720 :0 \
# & export DISPLAY=":0" \
# && PATH="$MAIKO_INSTALLDIR:$PATH" \
# && ${ONLINE_DIR}/docker_medley/loadup/loadup-online-from-full.sh \
# && cp -p ${MEDLEY_INSTALLDIR}/tmp/online.sysout ${MEDLEY_INSTALLDIR}/loadups/full.sysout \
# && rm -rf ${ONLINE_DIR}/docker_medley/loadup

# clean up medley/.bashrc for use with xterm
RUN sed -i /PS1=/s/[email protected]/u@oio/ ${HOMEDIR}/.bashrc \
Expand All @@ -166,7 +169,7 @@ ENTRYPOINT USER=${USER_NAME} /bin/bash

# temp patch 2022-10-12
# COPY HELPSYS fixes into lispusers
COPY --chown=${USER_NAME}:${USER_NAME} misc/HELPSYS ${MEDLEY_INSTALLDIR}/lispusers/HELPSYS
COPY --chown=${USER_NAME}:${USER_NAME} misc/HELPSYS.LCOM ${MEDLEY_INSTALLDIR}/lispusers/HELPSYS.LCOM
#COPY --chown=${USER_NAME}:${USER_NAME} misc/HELPSYS ${MEDLEY_INSTALLDIR}/lispusers/HELPSYS
#COPY --chown=${USER_NAME}:${USER_NAME} misc/HELPSYS.LCOM ${MEDLEY_INSTALLDIR}/lispusers/HELPSYS.LCOM


Loading