Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • software/fchh-website-content
  • TarikZiyad/fchh-website-content
  • kosai_14/fchh-website-content
3 results
Show changes
Commits on Source (23)
Showing
with 11 additions and 11 deletions
......@@ -20,7 +20,7 @@ build:
- unzip -o $TEMPLATE_FILENAME
- rm $TEMPLATE_FILENAME
# Copy all files from the template repo, except Content Markdown files (already in working dir)
- rsync -va --exclude="src/pages/**/*.md" --exclude="src/pages/**/*.mdx" --exclude="src/content/**/*.md" --exclude="src/content/**/*.mdx" --exclude="public" --exclude ".git" fcos-suite-astro-main/ .
- rsync -va --exclude="src/pages/**/*.md" --exclude="src/pages/**/*.mdx" --exclude="src/content/**/*.md" --exclude="src/content/**/*.mdx" --exclude="src/content/**/*.yaml" --exclude="src/content/**/*.yml" --exclude="public" --exclude ".git" fcos-suite-astro-main/ .
- rm -rf fcos-suite-astro-main
# Replacing the whole Astro config is a temporary workaround b/c Astro
# currently doesn't support env variables inside of the config file.
......@@ -36,7 +36,7 @@ build:
- dist
environment:
name: $CI_COMMIT_REF_SLUG
url: $TARGET_HOST/$CI_PROJECT_NAME/$CI_COMMIT_REF_SLUG
url: $SITE_URL
deploy:
stage: deploy
......@@ -48,12 +48,12 @@ deploy:
- mkdir -p ~/.ssh
- echo "$HTACCESS" >> dist/.htaccess
- echo "$SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts
- echo "Deploying for branch $CI_COMMIT_REF_SLUG – will be available at 🌎 $TARGET_HOST/$CI_PROJECT_NAME/$CI_COMMIT_REF_SLUG"
- echo "Deploying for branch $CI_COMMIT_REF_SLUG – will be available at 🌎 $SITE_URL"
script:
- lftp -e "set ftp:list-options -a; set net:timeout 5; set net:max-retries 3; set net:reconnect-interval-base 5; open sftp://$SFTP_HOST; user $SFTP_USER $SFTP_PASSWORD; mirror --exclude .well-known/ --reverse --delete ./dist/ $SFTP_FOLDER/$CI_PROJECT_NAME/$CI_COMMIT_REF_SLUG/; bye"
- lftp -e "set ftp:list-options -a; set net:timeout 5; set net:max-retries 3; set net:reconnect-interval-base 5; open sftp://$SFTP_HOST; user $SFTP_USER $SFTP_PASSWORD; mirror --exclude .well-known/ --reverse --delete ./dist/ $SFTP_FOLDER/$CI_COMMIT_REF_SLUG/; bye"
environment:
name: $CI_COMMIT_REF_SLUG
url: $TARGET_HOST/$CI_PROJECT_NAME/$CI_COMMIT_REF_SLUG
url: $SITE_URL
on_stop: delete
delete:
......@@ -66,7 +66,7 @@ delete:
- mkdir -p ~/.ssh
- echo "$SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts
script:
- lftp -e "set ftp:list-options -a; set net:timeout 5; set net:max-retries 3; set net:reconnect-interval-base 5; open sftp://$SFTP_HOST; user $SFTP_USER $SFTP_PASSWORD; rm -r $SFTP_FOLDER/$CI_PROJECT_NAME/$CI_COMMIT_REF_SLUG/; bye"
- lftp -e "set ftp:list-options -a; set net:timeout 5; set net:max-retries 3; set net:reconnect-interval-base 5; open sftp://$SFTP_HOST; user $SFTP_USER $SFTP_PASSWORD; rm -r $SFTP_FOLDER/$CI_COMMIT_REF_SLUG/; bye"
when: manual
environment:
name: $CI_COMMIT_REF_SLUG
......
public/images/fchh/Resources/FabCityFlyer.jpg

308 KiB

File added
public/images/fchh/Resources/LeitfadenLabGründung.jpg

145 KiB

public/images/slider/popupcircularhub2/BWS05306.JPG

3.28 MiB

public/images/slider/popupcircularhub2/BWS05358.JPG

3.75 MiB

public/images/slider/popupcircularhub2/BWS05388.JPG

3.59 MiB

public/images/slider/popupcircularhub2/BWS05395.JPG

3.75 MiB

public/images/slider/popupcircularhub2/ima_57b25ab.jpeg

3.35 MiB

public/images/slider/popupcircularhub2/image00014.jpeg

3.94 MiB

public/images/slider/popupcircularhub2/image00016.jpeg

3.32 MiB

public/images/slider/popupcircularhub2/image00018.jpeg

4.08 MiB

public/images/slider/popupcircularhub2/image00023.jpeg

2.79 MiB

public/images/slider/popupcircularhub2/image00024.jpeg

3.5 MiB

public/images/slider/popupcircularhub2/image00025.jpeg

2.22 MiB

---
img: images/logos/Logo_BWI.svg
img: /images/logos/Logo_BWI.svg
alt: Hamburger Behörde für Wirtschaft und Innovation
href: https://www.hamburg.de/bwi/
order: 1
......
---
img: images/logos/Logo_EU.svg
img: /images/logos/Logo_EU.svg
alt: Europäischer Fonds für regionale Entwicklung
href: https://www.europarl.europa.eu/factsheets/de/sheet/95/europaischer-fonds-fur-regionale-entwicklung-efre-
order: 0
......
......@@ -5,7 +5,7 @@ website: https://3dstrong.de/
address: Hermann-Blohm- Str. 3, 20457 Hamburg
lat: 53.53802268557425
lng: 9.96612051534355
image: images/network/map/3dstrong_map.svg
image: /images/network/map/3dstrong_map.svg
category: Digital-handwerkliche Produktionsstätte
relationStatus: Vereinsmitglied Fab City Hamburg e.V.
tags:
......
......@@ -6,7 +6,7 @@ website: https://attraktor.org
address: Eschelsweg 4, 22767 Hamburg
lat: 53.549864003284
lng: 9.9464665686577
image: images/network/map/attraktor_map.jpg
image: /images/network/map/attraktor_map.jpg
category: Fab Lab / Offene Werkstatt
relationStatus: Vereinsmitglied Fab City Hamburg e.V.
tags:
......
......@@ -9,7 +9,7 @@ website: https://curious.bio/
address: Stockmeyerstr. 43, Halle 4K, Eingang von der Wasserseite, 20457 Hamburg
lat: 53.541994386894
lng: 10.010334958155
image: images/network/map/curious_community_labs_map.jpg
image: /images/network/map/curious_community_labs_map.jpg
category: Fab Lab / Offene Werkstatt
relationStatus: Vereinsmitglied Fab City Hamburg e.V.
tags:
......