Skip to content

Commit

Permalink
fix: several issuers, warning, build on mac os in docker (#433)
Browse files Browse the repository at this point in the history
  • Loading branch information
deimosfr authored Jun 18, 2024
1 parent 82afc66 commit 7e139c4
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 31,049 deletions.
4 changes: 2 additions & 2 deletions .meta/links.toml
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ rust_memory_safety = "https://hacks.mozilla.org/2019/01/fearless-security-memory
rust_regex_syntax = "https://docs.rs/regex/1.3.6/regex/#syntax"
rust_sec = "https://rustsec.org/"
rust_subprocess = "https://docs.rs/subprocess"
rust_target_triples = "https://forge.rust-lang.org/platform-support.html"
rust_target_triples = "https://forge.rust-lang.org/platform-support.html"
rust_tier_1_platform = "https://forge.rust-lang.org/release/platform-support.html#tier-1"
rustup = "https://rustup.rs"
sematext = "https://sematext.com"
Expand Down Expand Up @@ -387,4 +387,4 @@ qovery_aws_iam_roles = "/guides/tutorial/use-aws-iam-roles-with-qovery"

[links.tutorials]

kubectl_eks = "/guides/tutorial/how-to-connect-to-your-eks-cluster-with-kubectl"
kubectl_eks = "/guides/tutorial/how-to-connect-to-your-eks-cluster-with-kubectl"
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:22.10
FROM ubuntu:22.04

RUN apt-get update && \
apt-get -y install yarnpkg bundler git locales sudo inotify-tools && \
apt-get -y install yarnpkg bundler git locales sudo inotify-tools npm && \
apt-get clean && \
ln -s /usr/bin/yarnpkg /usr/bin/yarn && \
locale-gen --no-purge en_US.UTF-8 && \
Expand Down
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,16 @@ This website is built using Docusaurus 2, a modern static website generator.
You can simply use Docker this way:

```bash
docker run -it --rm -v $(pwd):/mnt/documentation -p 3000:3000 qoveryrd/doc:0.2.1 /mnt/documentation/scripts/docker.sh
docker run -it --rm -v $(pwd):/mnt/documentation -p 3000:3000 qoveryrd/doc:0.2.2 /mnt/documentation/scripts/docker.sh
```

Important notes for Mac users:

* Switch to osxfs for file sharing in Docker Desktop settings (Preferences -> General -> Choose file sharing implementation for your containers -> osxfs)
* Add environment variable IS_DOCKER_ON_MAC=1 to the docker run command

```bash
docker run -it --rm -v $(pwd):/mnt/documentation -p 3000:3000 -e IS_DOCKER_ON_MAC=1 qoveryrd/doc:0.2.2 /mnt/documentation/scripts/docker.sh
```

Open a browser to http://localhost:3000
Expand Down
11 changes: 10 additions & 1 deletion README.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@ This website is built using Docusaurus 2, a modern static website generator.
You can simply use Docker this way:

```bash
docker run -it --rm -v $(pwd):/mnt/documentation -p 3000:3000 qoveryrd/doc:0.2.1 /mnt/documentation/scripts/docker.sh
docker run -it --rm -v $(pwd):/mnt/documentation -p 3000:3000 qoveryrd/doc:0.2.2 /mnt/documentation/scripts/docker.sh
```

Important notes for Mac users:

* Switch to osxfs for file sharing in Docker Desktop settings (Preferences -> General -> Choose file sharing implementation for your containers -> osxfs)
* Add environment variable IS_DOCKER_ON_MAC=1 to the docker run command

```bash
docker run -it --rm -v $(pwd):/mnt/documentation -p 3000:3000 -e IS_DOCKER_ON_MAC=1 qoveryrd/doc:0.2.2 /mnt/documentation/scripts/docker.sh
```

Open a browser to http://localhost:3000
Expand Down
1 change: 1 addition & 0 deletions scripts/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ GEM
zeitwerk (2.6.6)

PLATFORMS
aarch64-linux
arm64-darwin-20
arm64-darwin-21
x86_64-darwin-20
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

export LANG=en_US.UTF-8
# tmp fix https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
export NODE_OPTIONS=--openssl-legacy-provider
#export NODE_OPTIONS=--openssl-legacy-provider

cd /mnt/documentation/website
yarn
Expand Down
9 changes: 8 additions & 1 deletion scripts/live_update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@ ORIG_PWD=$(pwd)
cd website && yarn start --host 0.0.0.0 &
cd $ORIG_PWD

if [ "$(uname)" == "Linux" ] ; then
if [ $IS_DOCKER_ON_MAC -eq 1 ] ; then
echo "Docker on Mac, refreshing every 30s"
while [ 1 ] ; do
make generate USE_CONTAINER=none
sleep 30
done
elif [ "$(uname)" == "Linux" ] ; then
make generate USE_CONTAINER=none
check_bin inotifywait
inotifywait -qrm -e close_write . | while read content ; do
make generate USE_CONTAINER=none
Expand Down
5 changes: 2 additions & 3 deletions website/guides/getting-started/debugging.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
last_modified_on: "2024-04-12"
last_modified_on: "2024-06-11"
$schema: "/.meta/.schemas/guides.json"
title: Debugging
description: How to debug your application
Expand Down Expand Up @@ -78,7 +78,7 @@ In the main application view, you can see a table with the current application r


## Alerting
We highly recommend using tools like [Datadog][urls.datadog], [Sentry][urls.sentry] or [NewRelic][urls.new_relic] to manage your alerting.
We highly recommend using tools like [Datadog][urls.datadog], [Sentry][urls.sentry] or NewRelic to manage your alerting.
Qovery will provide easy integrations in the coming release. Check out our [roadmap][urls.qovery_roadmap]

Do you need any help? [Reach us on our forum][urls.qovery_forum]
Expand All @@ -89,7 +89,6 @@ Do you need any help? [Reach us on our forum][urls.qovery_forum]
[docs.using-qovery.deployment.running-and-deployment-statuses]: /docs/using-qovery/deployment/running-and-deployment-statuses/
[docs.using-qovery.troubleshoot]: /docs/using-qovery/troubleshoot/
[urls.datadog]: https://www.datadoghq.com
[urls.new_relic]: https://newrelic.com/
[urls.qovery_console]: https://console.qovery.com
[urls.qovery_forum]: https://discuss.qovery.com/
[urls.qovery_roadmap]: https://roadmap.qovery.com/roadmap
Expand Down
2 changes: 1 addition & 1 deletion website/guides/getting-started/debugging.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ In the main application view, you can see a table with the current application r


## Alerting
We highly recommend using tools like [Datadog][urls.datadog], [Sentry][urls.sentry] or [NewRelic][urls.new_relic] to manage your alerting.
We highly recommend using tools like [Datadog][urls.datadog], [Sentry][urls.sentry] or NewRelic to manage your alerting.
Qovery will provide easy integrations in the coming release. Check out our [roadmap][urls.qovery_roadmap]

Do you need any help? [Reach us on our forum][urls.qovery_forum]
Expand Down
Loading

0 comments on commit 7e139c4

Please sign in to comment.