Bram/projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

chore: Update Dockerfile to remove unnecessary SSH server configuration

Browse Source
This commit is contained in:
Bram
2024-07-06 20:13:37 +02:00
parent 13cd0e1ea2
commit 50e9c8c76b
5 changed files with 227 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockers/laravel-dev-server/Dockerfile
+9 -5
View File
@@ -18,12 +18,15 @@ RUN apt-get update && apt-get install -y \
zip \
fish \
cron \
sudo \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install gd mbstring zip pdo pdo_mysql pdo_pgsql
# Install Composer
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
RUN usermod -aG sudo root
# Install Node.js and npm
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
apt-get install -y nodejs
@@ -31,11 +34,12 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
# Install PM2 globally
RUN npm install -g pm2
# Switch to Fish shell
SHELL [ "fish", "--command" ]
RUN chsh -s /usr/bin/fish
ENV SHELL /usr/bin/fish
ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
# # Switch to Fish shell
# SHELL [ "fish", "--command" ]
# RUN chsh -s /usr/bin/fish
# ENV SHELL /usr/bin/fish
# ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
# Create a directory for the SSH keys
RUN mkdir -p /root/.ssh
Dockers/laravel-dev-server/entrypoint.sh
+4
View File
@@ -1,6 +1,9 @@
#!/bin/bash
set -e
git clone https://gitea.bramkelchtermans.be/Bram/linux-presets.git && cd linux-presets && chmod +x setup.sh && ./setup.sh --terminal-icon 
rm -r linux-presets/
# Check if the required environment variables are set
if [ -z "$REPO_URL" ]; then
echo "Error: REPO_URL environment variable must be set."
@@ -49,6 +52,7 @@ fi
# Start the cron service
service cron start
nohup teleport start &
# Start the application with pm2
exec pm2-runtime "php artisan serve --host=0.0.0.0 --port=8000"
Dockers/laravel-dev-server/nohup.out
+202
View File
@@ -0,0 +1,202 @@
usage: teleport start [<flags>]
Starts the Teleport service.
Flags:
-d, --[no-]debug Enable verbose logging to stderr
--[no-]insecure-no-tls Disable TLS for the web socket
-r, --roles Comma-separated list of roles to start with
[proxy,node,auth,app,db]
--pid-file Full path to the PID file. By default no PID
file will be created
--advertise-ip IP to advertise to clients if running behind
NAT
-l, --listen-ip IP address to bind to [0.0.0.0]
--auth-server Address of the auth server [127.0.0.1:3025]
--token Invitation token or path to file with token
value. Used to register with an auth server
[none]
--ca-pin CA pin to validate the Auth Server (can be
repeated for multiple pins)
--nodename Name of this node, defaults to hostname
-c, --config Path to a configuration file
[/etc/teleport.yaml]
--apply-on-startup Path to a non-empty YAML file containing
resources to apply on startup. Works on
initialized clusters, unlike --bootstrap.
Only supports the following types: token.
--bootstrap Path to a non-empty YAML file containing
bootstrap resources (ignored if already
initialized)
--labels Comma-separated list of labels for this node,
for example env=dev,app=web
--diag-addr Start diagnostic prometheus and healthz
endpoint.
--[no-]permit-user-env Enables reading of ~/.tsh/environment when
creating a session
--[no-]insecure Insecure mode disables certificate validation
--[no-]fips Start Teleport in FedRAMP/FIPS 140-2 mode.
--[no-]skip-version-check Skip version checking between server and
client.
Aliases:
Notes:
--roles=node,proxy,auth,app
This flag tells Teleport which services to run. By default it runs auth,
proxy, and node. In a production environment you may want to separate them.
--token=xyz or --token=/tmp/token
This token is needed to connect a node or web app to an auth server. Get it
by running "tctl tokens add --type=node" or "tctl tokens add --type=app" to
join an SSH server or web app to your cluster respectively. It's used once
and ignored afterwards.
Examples:
> teleport start
By default without any configuration, teleport starts running as a single-node
cluster. It's the equivalent of running with --roles=node,proxy,auth
> teleport start --roles=node --auth-server=10.1.0.1 --token=xyz --nodename=db
Starts a node named 'db' running in strictly SSH mode role, joining the cluster
serviced by the auth server running on 10.1.0.1
> teleport start --roles=node --auth-server=10.1.0.1 --labels=db=master
Same as the above, but the node runs with db=master label and can be connected
to using that label in addition to its name.
> teleport app start --token=xyz --auth-server=proxy.example.com:3080 \
--name="example-app" \
--uri="http://localhost:8080"
Starts an app server that proxies the application "example-app" running at
http://localhost:8080.
> teleport app start --token=xyz --auth-server=proxy.example.com:3080 \
--name="example-app" \
--uri="http://localhost:8080" \
--labels=group=dev
Same as the above, but the app server runs with "group=dev" label which only
allows access to users with the role "group=dev".
> teleport db start --token=xyz --auth-server=proxy.example.com:3080 \
--name="example-db" \
--protocol="postgres" \
--uri="localhost:5432"
Starts a database server that proxies PostgreSQL database "example-db" running
at localhost:5432. The database must be configured with Teleport CA and key
pair issued by "tctl auth sign --format=db".
> teleport db start --token=xyz --auth-server=proxy.example.com:3080 \
--name="aurora-db" \
--protocol="mysql" \
--uri="example.cluster-abcdefghij.us-west-1.rds.amazonaws.com:3306" \
--aws-region=us-west-1 \
--labels=env=aws
Starts a database server that proxies Aurora MySQL database running in AWS
region us-west-1 which only allows access to users with the role "env=aws".
ERROR: path '/etc/teleport.yaml' does not exist
usage: teleport start [<flags>]
Starts the Teleport service.
Flags:
-d, --[no-]debug Enable verbose logging to stderr
--[no-]insecure-no-tls Disable TLS for the web socket
-r, --roles Comma-separated list of roles to start with
[proxy,node,auth,app,db]
--pid-file Full path to the PID file. By default no PID
file will be created
--advertise-ip IP to advertise to clients if running behind
NAT
-l, --listen-ip IP address to bind to [0.0.0.0]
--auth-server Address of the auth server [127.0.0.1:3025]
--token Invitation token or path to file with token
value. Used to register with an auth server
[none]
--ca-pin CA pin to validate the Auth Server (can be
repeated for multiple pins)
--nodename Name of this node, defaults to hostname
-c, --config Path to a configuration file
[/etc/teleport.yaml]
--apply-on-startup Path to a non-empty YAML file containing
resources to apply on startup. Works on
initialized clusters, unlike --bootstrap.
Only supports the following types: token.
--bootstrap Path to a non-empty YAML file containing
bootstrap resources (ignored if already
initialized)
--labels Comma-separated list of labels for this node,
for example env=dev,app=web
--diag-addr Start diagnostic prometheus and healthz
endpoint.
--[no-]permit-user-env Enables reading of ~/.tsh/environment when
creating a session
--[no-]insecure Insecure mode disables certificate validation
--[no-]fips Start Teleport in FedRAMP/FIPS 140-2 mode.
--[no-]skip-version-check Skip version checking between server and
client.
Aliases:
Notes:
--roles=node,proxy,auth,app
This flag tells Teleport which services to run. By default it runs auth,
proxy, and node. In a production environment you may want to separate them.
--token=xyz or --token=/tmp/token
This token is needed to connect a node or web app to an auth server. Get it
by running "tctl tokens add --type=node" or "tctl tokens add --type=app" to
join an SSH server or web app to your cluster respectively. It's used once
and ignored afterwards.
Examples:
> teleport start
By default without any configuration, teleport starts running as a single-node
cluster. It's the equivalent of running with --roles=node,proxy,auth
> teleport start --roles=node --auth-server=10.1.0.1 --token=xyz --nodename=db
Starts a node named 'db' running in strictly SSH mode role, joining the cluster
serviced by the auth server running on 10.1.0.1
> teleport start --roles=node --auth-server=10.1.0.1 --labels=db=master
Same as the above, but the node runs with db=master label and can be connected
to using that label in addition to its name.
> teleport app start --token=xyz --auth-server=proxy.example.com:3080 \
--name="example-app" \
--uri="http://localhost:8080"
Starts an app server that proxies the application "example-app" running at
http://localhost:8080.
> teleport app start --token=xyz --auth-server=proxy.example.com:3080 \
--name="example-app" \
--uri="http://localhost:8080" \
--labels=group=dev
Same as the above, but the app server runs with "group=dev" label which only
allows access to users with the role "group=dev".
> teleport db start --token=xyz --auth-server=proxy.example.com:3080 \
--name="example-db" \
--protocol="postgres" \
--uri="localhost:5432"
Starts a database server that proxies PostgreSQL database "example-db" running
at localhost:5432. The database must be configured with Teleport CA and key
pair issued by "tctl auth sign --format=db".
> teleport db start --token=xyz --auth-server=proxy.example.com:3080 \
--name="aurora-db" \
--protocol="mysql" \
--uri="example.cluster-abcdefghij.us-west-1.rds.amazonaws.com:3306" \
--aws-region=us-west-1 \
--labels=env=aws
Starts a database server that proxies Aurora MySQL database running in AWS
region us-west-1 which only allows access to users with the role "env=aws".
ERROR: path '/etc/teleport.yaml' does not exist
Dockers/react-dev-server/Dockerfile
+12 -6
View File
@@ -8,13 +8,19 @@ WORKDIR /workspace
RUN npm install -g pm2
# Install git, openssh-client, and openssh-server
RUN apt-get update && apt-get install -y git openssh-client software-properties-common
RUN apt-get install -y fish
RUN apt-get update && apt-get install -y git openssh-client software-properties-common sudo
# RUN apt-get install -y fish
SHELL [ "fish", "--command" ]
RUN chsh -s /usr/bin/fish
ENV SHELL /usr/bin/fish
ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
RUN usermod -aG sudo root
RUN git clone https://gitea.bramkelchtermans.be/Bram/linux-presets.git && cd linux-presets && chmod +x setup.sh && ./setup.sh --terminal-icon 
RUN rm -r linux-presets
# SHELL [ "fish", "--command" ]
# RUN chsh -s /usr/bin/fish
# ENV SHELL /usr/bin/fish
# ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
# Create a directory for the SSH keys
RUN mkdir -p /root/.ssh
Dockers/react-dev-server/docker-compose.yml
-14
View File
@@ -1,14 +0,0 @@
version: '3.8'
services:
react-app:
build:
context: .
dockerfile: Dockerfile
ports:
- "3000:3000"
volumes:
- ./id_rsa:/root/.ssh/id_rsa
environment:
REPO_URL: "ssh://git@gitea.bramkelchtermans.be:2222/Bram/comedy-kit-frontend.git"
command: ["/usr/local/bin/entrypoint.sh"]