Merge branch 'main' into dependabot/npm_and_yarn/{{cookiecutter.proje…

…ct_slug}}/frontend/vite-5.4.7

.github/workflows/semantic-pull-request.yaml

@@ -19,4 +19,4 @@ jobs:
     steps:
       - uses: amannn/action-semantic-pull-request@v5
         env:
-          GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/semantic-release.yaml

@@ -18,6 +18,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
           persist-credentials: false
 
       - name: Setup Node.js
@@ -33,3 +34,5 @@ jobs:
 
       - name: Run Semantic Release
         run: npx semantic-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/setup-project.yaml

@@ -42,14 +42,18 @@ jobs:
     - name: Install Requirements
       shell: bash
       run: |
+        sudo apt-get update && sudo apt-get install --only-upgrade curl
+        sudo apt-get update && sudo apt-get install --only-upgrade make
+        sudo apt-get update && sudo apt-get install --only-upgrade python3       
         INSTALL_URL="https://raw.githubusercontent.com/sixfeetup/scaf/$GITHUB_REF_NAME/install.sh"
         export SCAF_SCRIPT_BRANCH=$GITHUB_REF_NAME
         git config --global init.defaultBranch main
         git config --global user.email "[email protected]"
         git config --global user.name "CI CD install deps"
         echo "Downloading install script from $INSTALL_URL"
         rm -f $HOME/.local/bin/scaf
-        curl -sSL $INSTALL_URL | sh
+        echo "Installing scaf from $INSTALL_URL"
+        curl -sSL $INSTALL_URL | DEBUG=True bash
 
     - name: Create Project with Scaf
       shell: bash

.gitignore

@@ -240,7 +240,6 @@ fabric.properties
 # VcsDirectoryMappings
 .idea/vcs.xml
 
-.idea/cookiecutter-sixiedjango.iml
 .idea/inspectionProfiles/profiles_settings.xml
 .idea/misc.xml
 

CHANGELOG.md

@@ -1,5 +1,77 @@
 # Changelog
 
+## [1.18.0](https://github.com/sixfeetup/scaf/compare/v1.17.2...v1.18.0) (2024-11-01)
+
+### Features
+
+* Gfranxman/345 ensure latest version of rsync ([#400](https://github.com/sixfeetup/scaf/issues/400)) ([8dbc784](https://github.com/sixfeetup/scaf/commit/8dbc784b8e3cfac363d36592103bde49c4d9ed55))
+
+## [1.17.2](https://github.com/sixfeetup/scaf/compare/v1.17.1...v1.17.2) (2024-10-30)
+
+### Bug Fixes
+
+* Do not change the ownership of the bind mounted directory ([#414](https://github.com/sixfeetup/scaf/issues/414)) ([2b4469e](https://github.com/sixfeetup/scaf/commit/2b4469e669ffefdf0370d688c727db14ae7f995e)), closes [#413](https://github.com/sixfeetup/scaf/issues/413)
+
+### Documentation
+
+* change readme structure ([#369](https://github.com/sixfeetup/scaf/issues/369)) ([abd3b64](https://github.com/sixfeetup/scaf/commit/abd3b649852e7bccced5d5fbc38147e4a3f4280a)), closes [#365](https://github.com/sixfeetup/scaf/issues/365)
+
+## [1.17.1](https://github.com/sixfeetup/scaf/compare/v1.17.0...v1.17.1) (2024-10-11)
+
+### Bug Fixes
+
+* updating tests in install.sh to detect missing preferred bin folder. ([#404](https://github.com/sixfeetup/scaf/issues/404)) ([e694307](https://github.com/sixfeetup/scaf/commit/e694307e18357461e7bacffe157916573e8eac48)), closes [#403](https://github.com/sixfeetup/scaf/issues/403)
+
+## [1.17.0](https://github.com/sixfeetup/scaf/compare/v1.16.1...v1.17.0) (2024-10-05)
+
+### Features
+
+* deploy apps with ArgoCD ([6938661](https://github.com/sixfeetup/scaf/commit/69386611ee96ec2e0278fbf57717db10bc484c7e))
+
+## [1.16.1](https://github.com/sixfeetup/scaf/compare/v1.16.0...v1.16.1) (2024-09-25)
+
+### Bug Fixes
+
+* entrypoint.sh: Reorder commands so UID and GID checks work ([#395](https://github.com/sixfeetup/scaf/issues/395)) ([bd8e647](https://github.com/sixfeetup/scaf/commit/bd8e6470260a087ea639ad52eb735d7065fe6f88))
+
+## [1.16.0](https://github.com/sixfeetup/scaf/compare/v1.15.1...v1.16.0) (2024-09-23)
+
+### Features
+
+* update text references to refer to Scaf instead of Sixie ([#393](https://github.com/sixfeetup/scaf/issues/393)) ([5288cf0](https://github.com/sixfeetup/scaf/commit/5288cf0ac843d7c474e6e16232b65795581f198f))
+
+## [1.15.1](https://github.com/sixfeetup/scaf/compare/v1.15.0...v1.15.1) (2024-09-21)
+
+### Bug Fixes
+
+* check for python commands, fallback to python3 refs [#386](https://github.com/sixfeetup/scaf/issues/386) ([#389](https://github.com/sixfeetup/scaf/issues/389)) ([7510477](https://github.com/sixfeetup/scaf/commit/7510477414c60b35a517c1416137164e98e7a5d8))
+
+## [1.15.0](https://github.com/sixfeetup/scaf/compare/v1.14.0...v1.15.0) (2024-09-21)
+
+### Features
+
+* added local registry support and improved setup (close [#353](https://github.com/sixfeetup/scaf/issues/353)) ([32de8c7](https://github.com/sixfeetup/scaf/commit/32de8c76b260f81774e087dc221c237767a0049a))
+* Gfranxman/313 prefer dotlocalbin as install location ([#342](https://github.com/sixfeetup/scaf/issues/342)) ([dbb3556](https://github.com/sixfeetup/scaf/commit/dbb3556e7258a57e5105f80063f95f3222d3fd6a))
+* implement s3 storage for static and media files on production ([#339](https://github.com/sixfeetup/scaf/issues/339)) ([76afd23](https://github.com/sixfeetup/scaf/commit/76afd23da1aa0867422249584a3156f43b7b974e))
+* implement scaf challenge for session recording ([#379](https://github.com/sixfeetup/scaf/issues/379)) ([0c091af](https://github.com/sixfeetup/scaf/commit/0c091afbd574632350f2c4cdb43420fadb8eb317))
+* **install.sh:** force re-download of Scaf on each install ([#338](https://github.com/sixfeetup/scaf/issues/338)) ([f7ef3e3](https://github.com/sixfeetup/scaf/commit/f7ef3e3ac0876c70f4c6f3e1f34a41386321e9a3))
+* op inject secrets (close [#368](https://github.com/sixfeetup/scaf/issues/368)) ([58090b5](https://github.com/sixfeetup/scaf/commit/58090b56f65f35cb2c68258f0aa4f3aaf8509417))
+* reorder environment variables in k8s django config ([#350](https://github.com/sixfeetup/scaf/issues/350)) ([f2cb234](https://github.com/sixfeetup/scaf/commit/f2cb2349666ecd46f24145c49b5f42bbc189c9b4))
+* script to test cookiecutter part of Scaf ([952e276](https://github.com/sixfeetup/scaf/commit/952e276852afe84cdbfca062da65fcae6cad6bc8))
+
+### Bug Fixes
+
+* Fixes frontend tests ([#363](https://github.com/sixfeetup/scaf/issues/363)) ([4a2a5b2](https://github.com/sixfeetup/scaf/commit/4a2a5b254891fd4b1688499d17240aa93356ce81))
+* mailhog port config (closes [#249](https://github.com/sixfeetup/scaf/issues/249)) ([cea1602](https://github.com/sixfeetup/scaf/commit/cea1602d99e5a03e63fc8cffcc842844bf648897))
+* Specify the full container path, including the host. ([#309](https://github.com/sixfeetup/scaf/issues/309)) ([2fa7276](https://github.com/sixfeetup/scaf/commit/2fa727672fc6b8ab2a0c40550f63cf27ba3b859c)), closes [#308](https://github.com/sixfeetup/scaf/issues/308)
+* Update logo ([#373](https://github.com/sixfeetup/scaf/issues/373)) ([afe2d84](https://github.com/sixfeetup/scaf/commit/afe2d849ad6db3ca05d812d1da12c02a9f127b96))
+* use GitHub token for semantic release workflow ([b5eef60](https://github.com/sixfeetup/scaf/commit/b5eef607dbc4b7bad9a6037bb8bc30dd81c100d2))
+
+### Documentation
+
+* add disk space warning to README ([#385](https://github.com/sixfeetup/scaf/issues/385)) ([4262b2d](https://github.com/sixfeetup/scaf/commit/4262b2d0868edf3dd1b22a6aef5aac78ae203afb))
+* update related to optional GraphQL ([#366](https://github.com/sixfeetup/scaf/issues/366)) ([92bfc8d](https://github.com/sixfeetup/scaf/commit/92bfc8d61f53d9845a3d7e952c96225b22e95a3d)), closes [#290](https://github.com/sixfeetup/scaf/issues/290)
+
 ## [1.14.0](https://github.com/sixfeetup/scaf/compare/v1.13.2...v1.14.0) (2024-09-04)
 
 ### Features

Dockerfile

@@ -1,11 +1,12 @@
-FROM python:3.10-alpine
+FROM python:3.12-alpine
 
 RUN set -eux; \
   apk add git shadow su-exec; \
   PIP_ROOT_USER_ACTION=ignore pip install uv; \
   uv pip install --system black isort cookiecutter
 
 COPY ./entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
 
 RUN addgroup -S scaf && adduser -s /bin/ash -S scaf -G scaf
 WORKDIR /home/scaf/out

README.md

@@ -35,7 +35,7 @@ contains the following:
 Installation is supported on Linux and macOS:
 
 ```
-curl -sSL https://raw.githubusercontent.com/sixfeetup/scaf/main/install.sh | sh
+curl -sSL https://raw.githubusercontent.com/sixfeetup/scaf/main/install.sh | bash
 ```
 
 The installation script will install kubectl, kind, and Tilt if it can't

cookiecutter.json

@@ -1,9 +1,9 @@
 {
-  "project_name": "My Awesome Sixie Project",
+  "project_name": "My Awesome Scaf Project",
   "project_slug": "{{ cookiecutter.project_name.lower()|replace(' ', '_')|replace('-', '_')|replace('.', '_')|trim() }}",
   "project_dash": "{{ cookiecutter.project_name.lower()|replace(' ', '-')|replace('_', '-')|replace('.', '-')|trim() }}",
   "description": "Behold My Awesome Project!",
-  "author_name": "Joe Sixie",
+  "author_name": "Joe Scaf",
   "domain_name": "sixfeetup.com",
   "email": "{{ cookiecutter.author_name.lower()|replace(' ', '-') }}@{{ cookiecutter.domain_name }}",
   "version": "0.1.0",

entrypoint.sh

@@ -20,26 +20,26 @@ fi
 
 # Function to check if a group with the given GID already exists
 group_exists_with_gid() {
+    echo "Checking if user with UID $1 exists..."
     getent group | cut -d: -f3 | grep -q "^$1$"
-    echo "Checking if group with GID $1 exists..."
 }
 
 # Function to check if a user with the given UID already exists
 user_exists_with_uid() {
-    getent passwd | cut -d: -f3 | grep -q "^$1$"
     echo "Checking if user with UID $1 exists..."
+    getent passwd | cut -d: -f3 | grep -q "^$1$"
 }
 
 # Function to check if the scaf user already has the target UID
 scaf_has_uid() {
-    [ "$(id -u scaf)" -eq "$1" ]
     echo "Checking if scaf has UID $1..."
+    [ "$(id -u scaf)" -eq "$1" ]
 }
 
 # Function to check if the scaf group already has the target GID
 scaf_has_gid() {
-    [ "$(getent group scaf | cut -d: -f3)" -eq "$1" ]
     echo "Checking if scaf group has GID $1..."
+    [ "$(getent group scaf | cut -d: -f3)" -eq "$1" ]
 }
 
 # Modify the scaf user account to match the host user, adjusting for existing GID
@@ -72,8 +72,6 @@ else
     echo "scaf already has the UID $HOST_UID."
 fi
 
-chown scaf:scaf /home/scaf/out
-
 echo "Finalizing: Dropping privileges and executing command..."
 # Drop privileges and execute the next container command, or 'sh' if not specified
 if [ "$#" -gt 0 ]; then

hooks/post_gen_project.py

@@ -27,7 +27,6 @@
     shutil.rmtree("frontend")
     file_names = [
         os.path.join("k8s", "base", "frontend.yaml"),
-        os.path.join("k8s", "prod", "patch-react.yaml"),
     ]
     for file_name in file_names:
         os.remove(file_name)