Skip to content

Commit

Permalink
Various Fixes
Browse files Browse the repository at this point in the history
+ Docker ignore fix
+ gitignore fix
+ env template typo fix
+ SignIn restore
  • Loading branch information
IvanLieckens committed Sep 23, 2024
1 parent e0d16a8 commit a80c8fd
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 15 deletions.
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.sitecore
build
docker
local-containers
packages
**/bin/
**/obj/
Expand All @@ -24,4 +25,7 @@ docker-compose*
scjssconfig.json
**/*.yml
**/*.module.json
**/*.user
**/*.suo
**/*.scindex
sitecore.json
16 changes: 2 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Thumbs.db
*.exe
*.pdb
*.user
# Make exception for Feature.User folder
!authoring/items/Mvp/Feature.User
*.aps
*.pch
*.vspscc
Expand Down Expand Up @@ -46,19 +48,5 @@ _ReSharper*/
# Nuget packages folder
packages/

# Docker folders
/docker/data/cm/*
!/docker/data/cm/.gitkeep
/docker/data/sql/*
!/docker/data/sql/.gitkeep
/docker/data/solr/*
!/docker/data/solr/.gitkeep
/docker/deploy/platform/*
!/docker/deploy/platform/.gitkeep
/docker/deploy/mvp-rendering/*
!/docker/deploy/mvp-rendering/.gitkeep
/docker/traefik/certs/*.pem
/docker/build/*

.vercel
xmcloud.plugin.pre-release.json
13 changes: 13 additions & 0 deletions authoring/items/Mvp/Feature.User/User.module.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"namespace": "Feature.User",
"items": {
"includes": [
{
"name": "layouts",
"path": "/sitecore/layout/Renderings/Feature/User",
"allowedPushOperations": "createUpdateAndDelete",
"scope": "itemAndDescendants"
}
]
}
}
23 changes: 23 additions & 0 deletions authoring/items/Mvp/Feature.User/items/layouts/User.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
ID: "ffebe358-62d6-4257-9de5-24b0aa9a6a7a"
Parent: "DA61AD50-8FDB-4252-A68F-B4470B1C9FE8"
Template: "7ee0975b-0698-493e-b3a2-0b2ef33d0522"
Path: /sitecore/layout/Renderings/Feature/User
Languages:
- Language: en
Versions:
- Version: 1
Fields:
- ID: "25bed78c-4957-4165-998a-ca1b52f67497"
Hint: __Created
Value: 20210901T153037Z
- ID: "8cdc337e-a112-42fb-bbb4-4143751e123f"
Hint: __Revision
Value: "295190ba-eb58-4608-9140-81a4c6fb1ba7"
- ID: "badd9cf9-53e0-4d0c-bcc0-2d784c282f6a"
Hint: __Updated by
Value: |
sitecore\Admin
- ID: "d9cf14b1-fa16-4ba6-9288-e8a174d4d522"
Hint: __Updated
Value: 20210901T153037Z
30 changes: 30 additions & 0 deletions authoring/items/Mvp/Feature.User/items/layouts/User/SignIn.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
ID: "00147a0f-476b-4c99-8a10-e6b4fcfcece0"
Parent: "ffebe358-62d6-4257-9de5-24b0aa9a6a7a"
Template: "04646a89-996f-4ee7-878a-ffdbf1f0ef0d"
Path: /sitecore/layout/Renderings/Feature/User/SignIn
SharedFields:
- ID: "037fe404-dd19-4bf7-8e30-4dadf68b27b0"
Hint: componentName
Value: SignIn
- ID: "06d5295c-ed2f-4a54-9bf2-26228d113318"
Hint: __Icon
Value: Office/32x32/log_in.png
Languages:
- Language: en
Versions:
- Version: 1
Fields:
- ID: "25bed78c-4957-4165-998a-ca1b52f67497"
Hint: __Created
Value: 20210901T153142Z
- ID: "8cdc337e-a112-42fb-bbb4-4143751e123f"
Hint: __Revision
Value: "7fc279bf-6548-4f42-9ff7-efe6b3a467ac"
- ID: "badd9cf9-53e0-4d0c-bcc0-2d784c282f6a"
Hint: __Updated by
Value: |
sitecore\Admin
- ID: "d9cf14b1-fa16-4ba6-9288-e8a174d4d522"
Hint: __Updated
Value: 20210901T153342Z
2 changes: 1 addition & 1 deletion local-containers/.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ TRAEFIK_IMAGE=traefik:v2.11.0-windowsservercore-ltsc2022
SOLUTION_BUILD_IMAGE=mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022
SOLUTION_BASE_IMAGE=mcr.microsoft.com/windows/nanoserver:ltsc2022
NETCORE_BUILD_IMAGE=mcr.microsoft.com/dotnet/sdk:8.0-nanoserver-ltsc2022
NETCORE_RELEASE_IMAGE= mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-ltsc2022
NETCORE_RELEASE_IMAGE=mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-ltsc2022

# Windows and Node.js version for JSS
NODEJS_PARENT_IMAGE=mcr.microsoft.com/windows/nanoserver:ltsc2022
Expand Down

0 comments on commit a80c8fd

Please sign in to comment.