Merge branch 'main' into umang/sun-965/timeout

.github/workflows/tests.yml

@@ -10,17 +10,17 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: run smoke tests
-      run: bash run_tests.sh
+      - uses: actions/checkout@v3
+      - name: run smoke tests
+        run: bash run_tests.sh
   test-stack:
     strategy:
       matrix:
         stack: [heroku-18, heroku-20, heroku-22]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: run stack test
-      run: bash test/stack-test.sh ${{ matrix.stack }}
-      env:
-        TAILSCALE_TEST_AUTH_KEY: ${{ secrets.TAILSCALE_TEST_AUTH_KEY }}
+      - uses: actions/checkout@v3
+      - name: run stack test
+        run: bash test/stack-test.sh ${{ matrix.stack }}
+        env:
+          TAILSCALE_TEST_AUTH_KEY: ${{ secrets.TAILSCALE_TEST_AUTH_KEY }}

.gitignore

@@ -1 +1,2 @@
 .env
+.idea

CHANGELOG.md

@@ -1,34 +1,38 @@
 ## Unreleased
 
-* Update README to include mention of serving application to only users in your
-  Tailnet.
+- Update README.
+- Upgrade Tailscale (1.76.6)
+
+## 1.1.2
+
+- Remove proxychains.
 
 ## 1.1.1 (2023-06-15)
 
-* Swap the ``_`` character for ``-`` in the hostname for 
+- Swap the `_` character for `-` in the hostname for
   the DYNO environment variable.
 
 ## 1.1.0 (2023-06-15)
 
-* Updated the default TAILSCALE_HOSTNAME to be ``[commit]-[dyno]-[appname]``.
+- Updated the default TAILSCALE_HOSTNAME to be `[commit]-[dyno]-[appname]`.
   This requires [Heroku Labs runtime-dyno-metadata](https://devcenter.heroku.com/articles/dyno-metadata) to be enabled.
 
 ## 1.0.1 (2023-06-15)
 
-* Added ``TAILSCALE_BUILD_EXCLUDE_START_SCRIPT_FROM_PROFILE_D`` build environment variable
+- Added `TAILSCALE_BUILD_EXCLUDE_START_SCRIPT_FROM_PROFILE_D` build environment variable
   to control when the tailscale script starts.
 
 ## 1.0.1 (2023-06-13)
 
-* Updated default tailscale version from 1.40.0 to 1.42.0
+- Updated default tailscale version from 1.40.0 to 1.42.0
 
 ## 1.0.0 (2023-05-11)
 
-* Implement buildpack sourcing ideas from
+- Implement buildpack sourcing ideas from
   https://github.com/moneymeets/python-poetry-buildpack,
   https://github.com/heroku/heroku-buildpack-pgbouncer and
   tailscale-docker and tailscale-heroku.
-* Move the process to start tailscale into the .profile.d/ script.
-* Only start Tailscale when the auth key is present in the environment 
+- Move the process to start tailscale into the .profile.d/ script.
+- Only start Tailscale when the auth key is present in the environment
   variables.
-* Create a ``heroku-tailscale-test.sh`` script for easier testing/verification.
+- Create a `heroku-tailscale-test.sh` script for easier testing/verification.

CONTRIBUTING.md

@@ -1,9 +1,9 @@
 # Contributing Guidelines
 
-There are two different sets of tests to run. ``run_tests.sh`` does some basic
-verification of the bin scripts. ``stack-test.sh`` spins up a Docker image with
+There are two different sets of tests to run. `run_tests.sh` does some basic
+verification of the bin scripts. `stack-test.sh` spins up a Docker image with
 Heroku's base image to verify the installation works locally. To run this second one,
-you will need to create a Tailscale token that can connect to ``hello.ts.net``. See
+you will need to create a Tailscale token that can connect to `hello.ts.net`. See
 [Tailscale's documentation on testing](https://tailscale.com/kb/1073/hello/?q=testing).
 
 ```shell
@@ -14,17 +14,17 @@ test/stack-test.sh heroku-22
 
 ## CI TailScale auth token
 
-Eventually the GitHub ``TAILSCALE_TEST_AUTH_KEY`` will expire (every 90 days).
+Eventually the GitHub `TAILSCALE_TEST_AUTH_KEY` will expire (every 90 days).
 When that happens a new token will need to be generated. It should be reusable,
-ephemeral and have the ``tag:test`` tag applied to it. It will need to be copied
-to the ``TAILSCALE_TEST_AUTH_KEY`` repository secret for this repo.
+ephemeral and have the `tag:test` tag applied to it. It will need to be copied
+to the `TAILSCALE_TEST_AUTH_KEY` repository secret for this repo.
 
 ## Releasing updates
 
 ```shell
 heroku plugins:install buildpack-registry
 
-cd heroku-tailscale-buildpack
+cd heroku-buildpack-tailscale
 git checkout main
-heroku buildpacks:publish aspiredu/heroku-tailscale-buildpack
-```
+heroku buildpacks:publish sundaycarwash/heroku-buildpack-tailscale
+```

Dockerfile

@@ -10,6 +10,6 @@ RUN env -i PATH=$PATH HOME=$HOME STACK=$STACK /buildpack/bin/detect /app
 RUN env -i PATH=$PATH HOME=$HOME STACK=$STACK /buildpack/bin/compile /app /cache /env
 
 # Install test utililties
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update || true && apt-get install -y curl
 
 WORKDIR /app