Skip to content

Distinguish 'done' from 'configuring' in 2FA #35555

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

Closed
michielbdejong wants to merge 12 commits into from
Closed

Distinguish 'done' from 'configuring' in 2FA #35555

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
944187b
Proposed change to in-build docker-compose.yml and Dockerfile. The cu…
Mar 10, 2023
0046cd8
Minor improvements for devcontainer
R0Wi Mar 11, 2023
df0ba7d
Use ubuntu jammy and cleanup Dockerfile
R0Wi Mar 18, 2023
483a775
Minor DevContainer adjustments
R0Wi Mar 27, 2023
6677e22
Dedicated DevContainer user + NVM
R0Wi Mar 31, 2023
f3046ed
Configure line ending to let shell scripts work in Windows ENV
R0Wi Mar 31, 2023
ec4f3ff
Move git safe.directory to earlier stage
R0Wi Mar 31, 2023
b4372f6
Add .vscode to expected files list
R0Wi Apr 3, 2023
b35db66
Enbale apcu in devcontainer CLI
R0Wi Apr 4, 2023
0867c66
Move launch.json to .devcontainer and copy on start
R0Wi Apr 6, 2023
d9c66ba
Distinguish 'done' from 'configuring' in 2FA
michielbdejong Apr 10, 2023
9bad67e
fix test failing in drone
mrvahedi68 Apr 14, 2023
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
Prev Previous commit
Next Next commit
Use ubuntu jammy and cleanup Dockerfile 
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: MohammadReza vahedi <34796044+mrvahedi68@users.noreply.github.com>
  • Loading branch information
@R0Wi @mrvahedi68
R0Wi authored and mrvahedi68 committed Apr 19, 2023
commit df0ba7d1585d041e96420877b9960d3328a46f4c
27 changes: 12 additions & 15 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
FROM ubuntu:focal
FROM ubuntu:jammy

ARG DEBIAN_FRONTEND=noninteractive

# PHP
RUN apt-get update -y

RUN apt install -y apache2 vim software-properties-common sudo nano

RUN add-apt-repository ppa:ondrej/php
RUN apt-get update -y && \
apt install -y apache2 vim software-properties-common sudo nano

RUN apt-get install --no-install-recommends -y \
php8.1 \
Expand Down Expand Up @@ -39,8 +36,8 @@ RUN apt-get install --no-install-recommends -y \
nodejs \
npm

RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini
RUN echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini
RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini && \
echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini

# Autostart XDebug for apache
RUN { \
Expand All @@ -54,14 +51,14 @@ RUN apt-get -y install \
ca-certificates \
curl \
gnupg-agent \
software-properties-common
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
RUN add-apt-repository \
software-properties-common && \
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) \
stable"
RUN apt-get update -y
RUN apt-get install -y docker-ce docker-ce-cli containerd.io
RUN ln -s /var/run/docker-host.sock /var/run/docker.sock
stable" && \
apt-get update -y && \
apt-get install -y docker-ce docker-ce-cli containerd.io && \
ln -s /var/run/docker-host.sock /var/run/docker.sock

WORKDIR /var/www/html