Skip to content

Commit

Permalink
fix: Update node and others (#205)
Browse files Browse the repository at this point in the history
* fix: node-v in test action

* Updates

- Docker update for Ob 1.5.3
- Node update to 18.19 (forced by github actions)
- Chrome update within Obsidian to v114
- Removed uncessary packages
- Reordered Docker layers to have anki and obsidian at last
- now even stderr/stdout is transfered to log files

* fix rollup

* Update test-e2e.yml

* Update test-e2e.yml
  • Loading branch information
ShootingKing-AM authored Jan 5, 2024
1 parent e2df0d9 commit 8544785
Show file tree
Hide file tree
Showing 10 changed files with 1,836 additions and 3,494 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test e2e

env:
PLUGIN_NAME: obsidian-to-anki-plugin
NODE_V: '16'
NODE_V: '18.x'

on:
# push:
Expand Down Expand Up @@ -76,6 +76,9 @@ jobs:
# name: JUnit Reprot
# path: logs/test-reports/wdio.xml
# reporter: jest-junit
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: iterative/setup-cml@v1
if: always()

Expand Down
43 changes: 22 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,27 @@ RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && locale-gen

# Might only work if your host user and group IDs are both 1000.

RUN \
echo "**** install runtime packages ****" && \
apt-get update && \
apt-get install -y \
logrotate \
nano \
netcat-openbsd sshpass \
sudo && \
echo "**** install openssh-server ****" && \
apt-get install -y \
openssh-client \
openssh-server && \
## openssh-sftp-server && \
echo "**** setup openssh environment ****" && \
## sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
usermod --shell /bin/bash abc && \
rm -rf \
/tmp/*

RUN apt-get install -y '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libxcb-xinerama0 libxcb-image0 libxcb-icccm4 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 gnome-screenshot

RUN echo "**** download anki ****" && curl https://github.com/ankitects/anki/releases/download/2.1.60/anki-2.1.60-linux-qt6.tar.zst -L -o anki.tar.zst
RUN chmod +x ./anki.tar.zst && \
mkdir anki && \
Expand All @@ -45,8 +66,6 @@ RUN chmod +x ./anki.tar.zst && \
chmod +x ./install.sh && \
./install.sh

RUN apt-get install -y '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libxcb-xinerama0 libxcb-image0 libxcb-icccm4 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 gnome-screenshot

ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US.UTF-8
Expand All @@ -61,7 +80,7 @@ ENV QT_DEBUG_PLUGINS 1
# CMD /bin/bash -c "anki"

# # set version label
ARG OBSIDIAN_VERSION=0.15.9
ARG OBSIDIAN_VERSION=1.5.3

RUN \
echo "**** download obsidian ****" && \
Expand All @@ -81,24 +100,6 @@ ENV \
HOME="/vaults" \
TITLE="Obsidian v$OBSIDIAN_VERSION"

RUN \
echo "**** install runtime packages ****" && \
apt-get install -y \
logrotate \
nano \
netcat-openbsd sshpass \
sudo && \
echo "**** install openssh-server ****" && \
apt-get install -y \
openssh-client \
openssh-server && \
## openssh-sftp-server && \
echo "**** setup openssh environment ****" && \
## sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd_config && \
usermod --shell /bin/bash abc && \
rm -rf \
/tmp/*

RUN echo "**** cleanup ****" && \
apt-get autoclean && \
rm -rf \
Expand Down
Loading

0 comments on commit 8544785

Please sign in to comment.