Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
liyh42 committed Aug 13, 2024
1 parent 3e68756 commit dfd5735
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 64 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Build and Push Docker Image to Docker Hub

on:
push:
branches: [ "main" ]
tags:
- "v*"

jobs:
build:
Expand All @@ -21,4 +22,4 @@ jobs:
with:
context: .
push: true
tags: alvinleee/github-action-test:latest
tags: ${{secrets.DOCKERHUB_USERNAME}}/github-action-test:${{ github.ref }}
124 changes: 62 additions & 62 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,68 +16,68 @@ RUN apt install -y build-essential dpkg-dev libpulse-dev git autoconf libtool &&
FROM base
ARG ADDITIONAL_PACKAGES=""
ENV DEBIAN_FRONTEND=noninteractive
RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list && \
wget -qO- https://dl.google.com/linux/linux_signing_key.pub | apt-key add - && \
echo "deb https://mirrors.ustc.edu.cn/postgresql/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
apt update && apt install -y \
openssh-server \
crudini \
pulseaudio \
supervisor \
uuid-runtime \
xauth \
xautolock \
xfce4 \
xfce4-clipman-plugin \
xfce4-cpugraph-plugin \
xfce4-netload-plugin \
xfce4-screenshooter \
xfce4-taskmanager \
xfce4-terminal \
xfce4-xkb-plugin \
xorgxrdp \
xprintidle \
xrdp \
vim \
less \
locales \
iputils-ping \
traceroute \
telnet \
dialog \
dnsutils \
fuse \
libfuse2 \
iproute2 \
zsh \
zsh-syntax-highlighting \
tmux \
tree \
lrzsz \
jq \
language-pack-zh-hans \
*wqy* \
fcitx-googlepinyin \
fcitx-sunpinyin \
firefox \
google-chrome-stable \
vlc \
ansible \
openjdk-11-jdk \
python3-venv \
python3-pip \
kafkacat \
postgresql-client-13 \
redis-tools \
libaio1 \
libtinfo5 \
$ADDITIONAL_PACKAGES && \
apt remove -y light-locker xscreensaver && \
apt autoremove -y && \
mkdir -p /var/lib/xrdp-pulseaudio-installer

COPY --from=pulseaudiolib /pulseaudio-module-xrdp/src/.libs/*.so /var/lib/xrdp-pulseaudio-installer/
#RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list && \
# wget -qO- https://dl.google.com/linux/linux_signing_key.pub | apt-key add - && \
# echo "deb https://mirrors.ustc.edu.cn/postgresql/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
# wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
# apt update && apt install -y \
# openssh-server \
# crudini \
# pulseaudio \
# supervisor \
# uuid-runtime \
# xauth \
# xautolock \
# xfce4 \
# xfce4-clipman-plugin \
# xfce4-cpugraph-plugin \
# xfce4-netload-plugin \
# xfce4-screenshooter \
# xfce4-taskmanager \
# xfce4-terminal \
# xfce4-xkb-plugin \
# xorgxrdp \
# xprintidle \
# xrdp \
# vim \
# less \
# locales \
# iputils-ping \
# traceroute \
# telnet \
# dialog \
# dnsutils \
# fuse \
# libfuse2 \
# iproute2 \
# zsh \
# zsh-syntax-highlighting \
# tmux \
# tree \
# lrzsz \
# jq \
# language-pack-zh-hans \
# *wqy* \
# fcitx-googlepinyin \
# fcitx-sunpinyin \
# firefox \
# google-chrome-stable \
# vlc \
# ansible \
# openjdk-11-jdk \
# python3-venv \
# python3-pip \
# kafkacat \
# postgresql-client-13 \
# redis-tools \
# libaio1 \
# libtinfo5 \
# $ADDITIONAL_PACKAGES && \
# apt remove -y light-locker xscreensaver && \
# apt autoremove -y && \
# mkdir -p /var/lib/xrdp-pulseaudio-installer
#
#COPY --from=pulseaudiolib /pulseaudio-module-xrdp/src/.libs/*.so /var/lib/xrdp-pulseaudio-installer/
#ADD rootfs /
#ADD bin /usr/bin
#ADD etc /etc
Expand Down

0 comments on commit dfd5735

Please sign in to comment.