mirror of https://github.com/linkerd/website.git
				
				
				
			build(deps): update linkerd/dev from v30 to v44 (#1895)
Co-authored-by: Flynn <kflynn@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									0e547651a9
								
							
						
					
					
						commit
						63bec1a2f5
					
				| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    "name": "linkerd-website",
 | 
					    "name": "linkerd-website",
 | 
				
			||||||
    "image": "ghcr.io/linkerd/dev:v30",
 | 
					    "image": "ghcr.io/linkerd/dev:v44",
 | 
				
			||||||
    "onCreateCommand": ".devcontainer/on-create.sh",
 | 
					    "onCreateCommand": ".devcontainer/on-create.sh",
 | 
				
			||||||
    "extensions": [
 | 
					    "extensions": [
 | 
				
			||||||
        "DavidAnson.vscode-markdownlint",
 | 
					        "DavidAnson.vscode-markdownlint",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,6 +3,7 @@ name: install
 | 
				
			||||||
on:
 | 
					on:
 | 
				
			||||||
  pull_request:
 | 
					  pull_request:
 | 
				
			||||||
    paths:
 | 
					    paths:
 | 
				
			||||||
 | 
					    - .github/workflows/install.yml
 | 
				
			||||||
    - Makefile
 | 
					    - Makefile
 | 
				
			||||||
    - run.linkerd.io/public/install*
 | 
					    - run.linkerd.io/public/install*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,17 +11,11 @@ jobs:
 | 
				
			||||||
  lint:
 | 
					  lint:
 | 
				
			||||||
    name: Lint install script
 | 
					    name: Lint install script
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    container:
 | 
					 | 
				
			||||||
      image: ghcr.io/linkerd/dev:v39
 | 
					 | 
				
			||||||
      options: --user root
 | 
					 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
 | 
					    - uses: linkerd/dev/actions/setup-tools@v44
 | 
				
			||||||
    - name: Checkout code
 | 
					    - name: Checkout code
 | 
				
			||||||
      uses: actions/checkout@v4
 | 
					      uses: actions/checkout@v4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: On create
 | 
					 | 
				
			||||||
      run: |
 | 
					 | 
				
			||||||
        .devcontainer/on-create.sh
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    - name: Lint install script
 | 
					    - name: Lint install script
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        make shellcheck
 | 
					        make shellcheck
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,10 +11,8 @@ jobs:
 | 
				
			||||||
  publish:
 | 
					  publish:
 | 
				
			||||||
    name: Publish
 | 
					    name: Publish
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    container:
 | 
					 | 
				
			||||||
      image: ghcr.io/linkerd/dev:v39
 | 
					 | 
				
			||||||
      options: --user root
 | 
					 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
 | 
					    - uses: linkerd/dev/actions/setup-tools@v44
 | 
				
			||||||
    - name: Checkout code
 | 
					    - name: Checkout code
 | 
				
			||||||
      uses: actions/checkout@v4
 | 
					      uses: actions/checkout@v4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,22 +3,20 @@ name: validate
 | 
				
			||||||
on:
 | 
					on:
 | 
				
			||||||
  pull_request:
 | 
					  pull_request:
 | 
				
			||||||
    paths:
 | 
					    paths:
 | 
				
			||||||
 | 
					    - .github/workflows/validate.yml
 | 
				
			||||||
    - linkerd.io/**
 | 
					    - linkerd.io/**
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  linkerd_io:
 | 
					  linkerd_io:
 | 
				
			||||||
    name: Validate generated HTML
 | 
					    name: Validate generated HTML
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    container:
 | 
					 | 
				
			||||||
      image: ghcr.io/linkerd/dev:v39
 | 
					 | 
				
			||||||
      options: --user root
 | 
					 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
 | 
					    - uses: linkerd/dev/actions/setup-tools@v44
 | 
				
			||||||
    - name: Checkout code
 | 
					    - name: Checkout code
 | 
				
			||||||
      uses: actions/checkout@v4
 | 
					      uses: actions/checkout@v4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: On create
 | 
					    - name: On create
 | 
				
			||||||
      run: |
 | 
					      run: .devcontainer/on-create.sh
 | 
				
			||||||
        .devcontainer/on-create.sh
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Lint markdown
 | 
					    - name: Lint markdown
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -10,7 +10,7 @@ Source code for the linkerd.io website.
 | 
				
			||||||
   ```bash
 | 
					   ```bash
 | 
				
			||||||
   docker run \
 | 
					   docker run \
 | 
				
			||||||
      --mount type=bind,source="$(pwd)",target=/website --workdir=/website \
 | 
					      --mount type=bind,source="$(pwd)",target=/website --workdir=/website \
 | 
				
			||||||
      ghcr.io/linkerd/dev:v39 sh -c ".devcontainer/on-create.sh && make lint check"
 | 
					      ghcr.io/linkerd/dev:v44 sh -c ".devcontainer/on-create.sh && make lint check"
 | 
				
			||||||
   ```
 | 
					   ```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
1. Install Hugo to run the site locally:
 | 
					1. Install Hugo to run the site locally:
 | 
				
			||||||
| 
						 | 
					@ -109,13 +109,13 @@ main from slate-linkerd and add it to the public dir.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Notes
 | 
					### Notes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- This does not update api.linkerd.io, see the section for that specifically to
 | 
					* This does not update api.linkerd.io, see the section for that specifically to
 | 
				
			||||||
  update it.
 | 
					  update it.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- There is no caching in front of run.linkerd.io and versioncheck.linkerd.io.
 | 
					* There is no caching in front of run.linkerd.io and versioncheck.linkerd.io.
 | 
				
			||||||
  You should see updates there immediately.
 | 
					  You should see updates there immediately.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- There is caching for non-html pages in front of linkerd.io. If you're updating
 | 
					* There is caching for non-html pages in front of linkerd.io. If you're updating
 | 
				
			||||||
  a non-html page for linkerd.io, it might be worth flushing the cache
 | 
					  a non-html page for linkerd.io, it might be worth flushing the cache
 | 
				
			||||||
  (cloudflare) and waiting awhile.
 | 
					  (cloudflare) and waiting awhile.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -114,7 +114,7 @@ case $OS in
 | 
				
			||||||
    exit 1
 | 
					    exit 1
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
OS=$(echo $OS | tr '[:upper:]' '[:lower:]')
 | 
					OS=$(echo "$OS" | tr '[:upper:]' '[:lower:]')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
checksumbin=$(command -v openssl) || checksumbin=$(command -v shasum) || {
 | 
					checksumbin=$(command -v openssl) || checksumbin=$(command -v shasum) || {
 | 
				
			||||||
  echo "Failed to find checksum binary. Please install openssl or shasum."
 | 
					  echo "Failed to find checksum binary. Please install openssl or shasum."
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -101,7 +101,7 @@ case $OS in
 | 
				
			||||||
    exit 1
 | 
					    exit 1
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
OS=$(echo $OS | tr '[:upper:]' '[:lower:]')
 | 
					OS=$(echo "$OS" | tr '[:upper:]' '[:lower:]')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
checksumbin=$(command -v openssl) || checksumbin=$(command -v shasum) || {
 | 
					checksumbin=$(command -v openssl) || checksumbin=$(command -v shasum) || {
 | 
				
			||||||
  echo "Failed to find checksum binary. Please install openssl or shasum."
 | 
					  echo "Failed to find checksum binary. Please install openssl or shasum."
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue